Changeset 488 for trunk/export

Timestamp:

Aug 24, 2010, 10:31:50 PM (14 years ago)

Author:

george

Message:

• Upraveno: Export do Lua souborů chybně zapisoval anglické originály obsahující středník. * Přidáno: WowLua pro 3.3.5a

File:

• trunk/export/export.php (modified) (3 diffs)

trunk/export/export.php

@@ -347 +347 @@
       while($DbRow = $DbResult2->fetch_assoc())
         $LookupTable[$DbRow['ShortCut']] = $DbRow;
+      //print_r($LookupTable);
         
       while(!$File->EOF())
@@ -353 +354 @@
         if(strpos($Line, '=') !== false)
         {
-          $LineParts = explode(';', $Line);
-          $LineParts2 = explode('=', $LineParts[0]);
-          $Value['ShortCut'] = trim($LineParts2[0]);
-          $Value['Text'] = substr(trim($LineParts2[1]), 1, -1);
-          $Value['Comment'] = substr(trim($LineParts[1]), 3);
+          $LineParts = explode('=', $Line, 2);
+          $Value['ShortCut'] = trim($LineParts[0]);
+          $Line = trim($LineParts[1]);
+          if($Line[0] == '"')
+          {
+            // Quoted string value
+            $Line = substr($Line, 1); // Skip start qoute
+            $TempLine = str_replace('\"', '  ', $Line); // Temporary remove slashed quotes
+            $Value['Text'] = substr($Line, 0, strpos($TempLine, '"'));
+//            $Value['Text'] = str_replace('\n', "\n", $Value['Text']);
+//            $Value['Text'] = addslashes(stripslashes($Value['Text']));
+            $Line = trim(substr($Line, strpos($TempLine, '"') + 1)); // Skip closing quote and semicolon                                                                  {
+          } else 
+          {
+            // Nonstring value
+            $Value['Text'] = substr($Line, 0, strpos($Line, ';'));
+          }
+          $Line = substr($Line, strpos($Line, ';') + 1);
+          $Value['Comment'] = addslashes(stripslashes(substr($Line, 3))); // Skip " --"
 
           if(array_key_exists($Value['ShortCut'], $LookupTable))
@@ -373 +388 @@
           }
           $NewLine = $Value['ShortCut'].' = "'.$Value['Text'].'";';
-          if($Value['Comment'] != '') $NewLine .= ' -- '.$Value['Comment'];
-          $NewLine .= "\n";
+          //if($Value['Comment'] != '') $NewLine .= ' -- '.$Value['Comment'];
+          $NewLine .= "\r\n";
           $File2->WriteLine($NewLine);
         } else $File2->WriteLine($Line);