Changeset 381 for trunk/import/import_lua.php

Timestamp:

Mar 13, 2010, 9:42:12 PM (14 years ago)

Author:

george

Message:

• Opraveno: Řádky z Lua souborů se chybně načítaly, pokud obsahovaly \" nebo ; uvnitř textu.

File:

• trunk/import/import_lua.php (modified) (3 diffs)

trunk/import/import_lua.php

@@ -13 +13 @@
     {
       echo('<br />'.$Group['Name'].'<br />'); 
+      if($Group['LastVersion'] < $BuildNumber)
+      {
       $File = new FileStream();
       $File->OpenFile('../source/'.$import_version.'/lua/'.$Group['LuaFileName'].'.lua');
@@ -22 +24 @@
         if(strpos($Line, '=') !== false)
         {
-          $LineParts = explode(';', $Line);
-          $LineParts2 = explode('=', $LineParts[0]);
-          $Value['ShortCut'] = trim($LineParts2[0]);
-          $Value['Text'] = addslashes(stripslashes(substr(trim($LineParts2[1]), 1, -1)));
-          $Value['Comment'] = addslashes(stripslashes(substr(trim($LineParts[1]), 3)));
+          $LineParts = explode('=', $Line, 2);
+          $Value['ShortCut'] = trim($LineParts[0]);
+          $Line = substr(trim($LineParts[1]), 1);
+          $TempLine = str_replace('\"', '  ', $Line); // Temporary remove slashed quotes
+          $Value['Text'] = addslashes(stripslashes(substr($Line, 0, strpos($TempLine, '"'))));
+          $Line = trim(substr($Line, strpos($TempLine, '"') + 2)); // Skip closing quote and semicolon          
+          $Value['Comment'] = addslashes(stripslashes(substr($Line, 3))); // Skip " --"
+          print_r($Value);
 
           $Columns = '';
@@ -88 +93 @@
       echo('<br />Celkem: '.$Count.'  Nových: '.$NewCount.'<br />');
       $Database->SQLCommand('UPDATE `Group` SET `LastVersion` = "'.$BuildNumber.'", `LastImport` = NOW() WHERE `Id`='.$Group['Id']);
+      } else echo('Již importován pro verzi '.$import_version);
     }   
   }