Changeset 241

Timestamp:

Jul 3, 2009, 1:49:06 PM (15 years ago)

Author:

maron

Message:

oprava chyby s mezerou na konci a začátku textu, oprava místo textu null

Location:

trunk

Files:

• import/import_sql_mangos.php (modified) (2 diffs)
• includes/global_function.php (modified) (1 diff)

trunk/import/import_sql_mangos.php

@@ -31 +31 @@
                 {
                   $folow_structure = False;
-                  echo ('Struktura: <br />');
-                  print_r($structure);
-                  echo ('<br /><br />');
+                //  echo ('Struktura: <br />');
+                //  print_r($structure);
+                //  echo ('<br /><br />');
                 }
                 if (($folow_structure == True) and  ($Line != ''))
@@ -71 +71 @@
                                   $value_buff = $value_buff.$str2;
                               $str = substr($str,strlen($str2));
-                                  
                 }  
                             $LinePart = substr($LinePart,strlen($value_buff)+2);
-                          }
-                            $Value[$column] = trim($value_buff);
-                         //  echo ($column.'-'.$Value[$column].'<br>');
+                          } 
+                            if (($value_buff != 'null') and ($value_buff != 'NULL'))
+                                {
+                                  $str = '';
+                                  while(substr($value_buff,strlen($value_buff)-1,1) == " ") 
+                                  {
+                                    $value_buff = substr($value_buff,0,strlen($value_buff)-1);
+                                        $str .= ' ';
+                              }
+                                  $str2 = '';
+                                  while(substr($value_buff,0,1) == " ") 
+                                  {
+                                    $value_buff = substr($value_buff,1,strlen($value_buff)-1);
+                                        $str2 .= ' ';
+                              }
+                              $Value[$column] = $str2.trim($value_buff).$str;
+                                } else { 
+                                  $Value[$column] = '';
+                                }
+                            //  echo ($column.'-"'.$Value[$column].'"<br>');
                 }
 

trunk/includes/global_function.php

@@ -274 +274 @@
     $new = str_replace("�", "", $new);
 
+        if (($old == 'null') or ($old == 'NULL')) $old = '';
+        if (($new == 'null') or ($new == 'NULL')) $new = '';
+        
+        
     if(($old <> $new) and ($GroupItem['Column'] <> 'Comment')) 
     {