Changeset 4833

Timestamp:

02/03/10 10:26:32 (3 years ago)

Author:

nikrou

Message:

Feature 511 : fix problems with calendar functions
add pwg_db_concat() function

Location:

trunk

Files:

• admin/include/functions.php (modified) (1 diff)
• admin/include/functions_permalinks.php (modified) (1 diff)
• admin/permalinks.php (modified) (1 diff)
• include/calendar_base.class.php (modified) (2 diffs)
• include/dblayer/functions_mysql.inc.php (modified) (1 diff)
• include/dblayer/functions_pgsql.inc.php (modified) (1 diff)
• include/dblayer/functions_sqlite.inc.php (modified) (5 diffs)
• include/functions_calendar.inc.php (modified) (1 diff)

trunk/admin/include/functions.php

@@ -949 +949 @@
     $query = '
 UPDATE '.IMAGES_TABLE.'
-  SET path = CONCAT(\''.$fulldirs[$cat_id].'\',\'/\',file)
+  SET path = '.pwg_db_concat(array($fulldirs[$cat_id],'\'/\'','file')).'
   WHERE storage_category_id = '.$cat_id.'
 ;';

trunk/admin/include/functions_permalinks.php

@@ -193 +193 @@
 UPDATE '.CATEGORIES_TABLE.'
   SET permalink="'.$permalink.'"
-  WHERE id='.$cat_id.'
-  LIMIT 1';
+  WHERE id='.$cat_id;
+  //  LIMIT 1';
   pwg_query($query);
 

trunk/admin/permalinks.php

@@ -110 +110 @@
 SELECT
   id,
-  CONCAT(id, " - ", name, IF(permalink IS NULL, "", " √") ) AS name,
+  '.pwg_db_concat(array('id', '\' - \'', 'name', 'IF(permalink IS NULL, \'\', \' √\')')).' AS name,
   uppercats, global_rank
 FROM '.CATEGORIES_TABLE;

trunk/include/calendar_base.class.php

@@ -221 +221 @@
 
     $level_items = simple_hash_from_query($query, 'period', 'nb_images');
+    $level_items = array_to_int($level_items);
 
     if ( count($level_items)==1 and
@@ -292 +293 @@
     $current = implode('-', $page['chronology_date'] );
     $upper_items = array_from_query( $query, 'period');
-
-    usort($upper_items, 'date_compare');
+    $upper_items = array_to_int($upper_items);
+
+    usort($upper_items, 'version_compare');
     $upper_items_rank = array_flip($upper_items);
     if ( !isset($upper_items_rank[$current]) )
     {
       array_push($upper_items, $current);// just in case (external link)
-      usort($upper_items, 'date_compare');
+      usort($upper_items, 'version_compare');
       $upper_items_rank = array_flip($upper_items);
     }

trunk/include/dblayer/functions_mysql.inc.php

@@ -459 +459 @@
 }
 
+function pwg_db_concat($array)
+{
+  $string = implode($array, ',');
+  return 'CONCAT('. $string.')';
+}
+
 function pwg_db_concat_ws($array, $separator)
 {

trunk/include/dblayer/functions_pgsql.inc.php

@@ -393 +393 @@
 }
 
+function pwg_db_concat($array)
+{
+  $string = implode($array, ',');
+  return 'ARRAY_TO_STRING(ARRAY['.$string.'])';
+}
+
 function pwg_db_concat_ws($array, $separator)
 {

trunk/include/dblayer/functions_sqlite.inc.php

@@ -55 +55 @@
 
   $link->createFunction('now', 'pwg_now', 0);
+  $link->createFunction('unix_timestamp', 'pwg_unix_timestamp', 0);
   $link->createFunction('md5', 'md5', 1);
+  $link->createFunction('if', 'pwg_if', 3);
 
   $link->createAggregate('std', 'pwg_std_step', 'pwg_std_finalize');
@@ -402 +404 @@
 }
 
+function pwg_db_concat($array)
+{
+  return implode($array, ' || ');
+}
+
 function pwg_db_concat_ws($array, $separator)
 {
@@ -469 +476 @@
   }
 
-  return 'date('.$date.',\''.$period.' DAY\')';
+  return 'date('.$date.',\''.-$period.' DAY\')';
 }
 
@@ -512 +519 @@
 function pwg_db_get_dayofweek($date)
 {
-  return 'strftime(\'%w\','.$date.')+1';
+  return 'strftime(\'%w\','.$date.')';
 }
 
 function pwg_db_get_weekday($date)
 {
-  return 'strftime(\'%w\','.$date.')';
+  return 'strftime(\'%w\',date('.$date.',\'-1 DAY\'))';
 }
 
@@ -548 +555 @@
   return date('Y-m-d H:i:s');
 }
+
+function pwg_unix_timestamp()
+{
+  return time();
+}
+
+function pwg_if($expression, $value1, $value2) 
+{
+  if ($expression)
+  {
+    return $value1;
+  }
+  else
+  {
+    return $value2;
+  }
+} 
 
 function pwg_regexp($pattern, $string)

trunk/include/functions_calendar.inc.php

@@ -291 +291 @@
 }
 
-/*
- * callback to sort array with date comparaison
- *
- **/
-function date_compare(&$a, &$b)
+function array_to_int($array)
 {
-  $parts = explode('-', $a);
-  foreach ($parts as &$p) {
-    $p = (int)$p;
-  }
-  $a = implode('-', $parts);
-  $parts = explode('-', $b);
-  foreach ($parts as &$p) {
-    $p = (int)$p;
-  }
-  $b = implode('-', $parts);
-
-  return strcmp($a, $b);
+  foreach ($array as $k => $v)
+  {
+    if ((int)$k==$k)
+    {
+      $key = (int) $k;
+    }
+    else
+    {
+      $key = $k;
+    }
+    if (is_array($v))
+    {
+      $result[$key] = array_to_int($v);
+    }
+    else
+    {
+      if (is_int($v))
+      {
+        $value = (int) $v;
+      }
+      else
+      {
+        $value = $v;
+      }
+      $result[$key] = $value;
+    }
+  }
+  return $result;
 }
 ?>