Be sure there's no duplicated urltitle on the upgrade procedure. Refs #9

Plus some userapi corrections
zikula-modules · Dec 20, 2011 · 865c15c · 865c15c
1 parent 1dc0aa4
commit 865c15c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/src/modules/Clip/lib/Clip/Api/User.php b/src/modules/Clip/lib/Clip/Api/User.php
@@ -784,8 +784,8 @@ public function decodeurl($args)
                     $pubtitle = $matches[1];
                 }
 
-                // extract the urltitle[~id]
-                if (preg_match('~^([a-z0-9_\-'.$s.']+?)(\~(\d+))?$~i', $pubtitle, $matches)) {
+                // extract the urltitle[~id] when not submitting
+                if (!($func == 'edit' && !isset($pid)) && preg_match('~^([a-z0-9_\-'.$s.']+?)(\~(\d+))?$~i', $pubtitle, $matches)) {
                     $where = array();
 
                     if (isset($matches[3])) {
@@ -799,7 +799,7 @@ public function decodeurl($args)
                     $pid = Doctrine_Core::getTable('ClipModels_Pubdata'.$tid)
                            ->selectField('core_pid', $where);
 
-                    // invalid urltitle~id combination
+                    // invalid urltitle~pid combination
                     if (!$pid) {
                         return false;
                     }

diff --git a/src/modules/Clip/lib/Clip/Installer.php b/src/modules/Clip/lib/Clip/Installer.php
@@ -585,7 +585,7 @@ private function renameRoutine()
 
         foreach ($sql as $q) {
             if (!DBUtil::executeSQL($q)) {
-                return LogUtil::registerError($this->__('Error! Update attempt failed.')." - $sql");
+                return LogUtil::registerError($this->__('Error! Update attempt failed.')." - $q");
             }
         }
 
@@ -1003,7 +1003,7 @@ private function upgradeDBpre09()
         // execute
         foreach ($sql as $q) {
             if (!DBUtil::executeSQL($q)) {
-                return LogUtil::registerError($this->__('Error! Update attempt failed.')." - $sql");
+                return LogUtil::registerError($this->__('Error! Update attempt failed.')." - $q");
             }
         }
         // homepage function check module = 'Clip' => func: list/display
@@ -1032,24 +1032,31 @@ private static function introduceUrltitle()
         // update the database
         $pubtypes = Doctrine_Core::getTable('Clip_Model_Pubtype')->selectFieldArray('tid');
         foreach ($pubtypes as $tid) {
-            //DoctrineUtil::createColumn('clip_pubdata'.$tid, 'urltitle', array('type' => 'string', 'length' => 255));
+            DoctrineUtil::createColumn('clip_pubdata'.$tid, 'urltitle', array('type' => 'string', 'length' => 255));
 
             // fill the urltitles
-            $sql = array();
+            $urltitles  = array();
 
-            $tablename  = DBUtil::getLimitedTablename('clip_pubdata'.$tid);
             $titlefield = Clip_Util::getTitleField($tid);
-            $records    = Doctrine_Core::getTable('ClipModels_Pubdata'.$tid)->selectFieldArray($titlefield, array(), '', false, 'id');
+            $titles     = Doctrine_Core::getTable('ClipModels_Pubdata'.$tid)->selectFieldArray($titlefield, array(), '', false, 'id');
 
-            foreach ($records as $id => $title) {
+            foreach ($titles as $id => $title) {
                 $urltitle = substr(DataUtil::formatPermalink($title), 0, 255);
 
-                $sql[] = "UPDATE {$tablename} SET urltitle = '{$urltitle}' WHERE id = {$id}";
+                while (in_array($urltitle, $urltitles)) {
+                    $urltitle++;
+                }
+
+                $urltitles[$id] = $urltitle;
             }
 
-            foreach ($sql as $q) {
+            $tablename = DBUtil::getLimitedTablename('clip_pubdata'.$tid);
+
+            foreach ($urltitles as $id => $urltitle) {
+                $q = "UPDATE {$tablename} SET urltitle = '{$urltitle}' WHERE id = {$id}";
+
                 if (!DBUtil::executeSQL($q)) {
-                    return LogUtil::registerError($this->__('Error! Update attempt failed.')." - $sql");
+                    return LogUtil::registerError($this->__('Error! Update attempt failed.')." - $q");
                 }
             }
         }