Changeset 612

Timestamp:

Nov 27, 2013, 12:25:17 AM (11 years ago)

Author:

maron

Message:

• Fixed: some bugs

Location:

tools/WoWHeadLoader

Files:

• WoWHeadLoader.lpi (modified) (2 diffs)
• WoWHeadLoader.lpr (modified) (8 diffs)

tools/WoWHeadLoader/WoWHeadLoader.lpi

@@ -60 +60 @@
   </CompilerOptions>
   <Debugging>
-    <Exceptions Count="4">
+    <Exceptions Count="5">
       <Item1>
         <Name Value="EAbort"/>
@@ -73 +73 @@
         <Name Value="EIdHTTPProtocolException"/>
       </Item4>
+      <Item5>
+        <Name Value="EIdSocketError"/>
+      </Item5>
     </Exceptions>
   </Debugging>

tools/WoWHeadLoader/WoWHeadLoader.lpr

@@ -81 +81 @@
   if HasOption('u', 'user') then begin
     Database.UserName := GetOptionValue('u', 'user');
-  end else Database.UserName := 'wowpreklad';
+  end else Database.UserName := 'import';
   if HasOption('p', 'password') then begin
     Database.Password := GetOptionValue('p', 'password');
-  end else Database.Password := 'hezkycesky';
+  end else Database.Password := 'test';
   if HasOption('t', 'host') then begin
     Database.Hostname := GetOptionValue('t', 'host');
@@ -93 +93 @@
 
   Database.Connect;
-  WriteLn('Nez zacnete aktualizujte udaje v tabulce ClientVersion. Texty se budou importovat jako nejpozdejsi pojmenovana verze!');
+  WriteLn('Nez zacnete, aktualizujte udaje v tabulce ClientVersion. Texty se budou importovat jako nejpozdejsi pojmenovana verze!');
  // ReadLn;
 
@@ -226 +226 @@
        part := Copy(data,0,Pos('</td>',data)-1);
 
+       if (Copy(part,0,Length(part)-1) = 'Suggested players: ') then Continue;
+
        if ((Pos('item',part) > 0)) then begin
          itemfound:=true;
          textend:='';
        end;
-       if ((Pos('<',part) = 0)) then begin
-          textend:=DelHtmlTags(part);
+       if ((Pos('<',part) = 0) and (Pos('&nbsp;',part) = 0)) then begin
+         // part := Copy(part,0,Pos('&nbsp;',part)-1);
+          textend:=TextStringReplace(DelHtmlTags(part));
        end;
        if ((Pos('object=',part) > 0) or (Pos('javascript',part) > 0) or ((itemfound = false) and (Pos('<',part) = 0))) then begin
-         part := DelHtmlTags(part); //todo
+         part := Copy(part,0,Pos('&nbsp;',part)-1);
+         part := TextStringReplace(DelHtmlTags(part)); //todo
          if (textobjective1 = '') then textobjective1:=part else
          if (textobjective2 = '') then textobjective2:=part else
@@ -250 +254 @@
        end;
 
-  except
-     on E: EIdHTTPProtocolException do
-     begin
-       if E.ErrorCode = 404 then
-         foundtext := false;
-     end;
-   //  on E: EIdSocketError do then
-  //       foundtext := false;
-  //   end;
-  end;
 
 
   If foundtext then begin
     DBRows := Database.Query('SELECT * FROM  `TextQuest` WHERE  `Entry` ='+IntToStr(Id)+' AND  `Language` =0 ORDER BY  `TextQuest`.`VersionEnd` DESC ');
-    {
-    if not (CompareStrings(DBRows.Data[0].Values['Title'],textname)) then
-      WriteLn('"'+DBRows.Data[0].Values['Title']+'" XXXXX "'+textname+'"');
-    if not (CompareStrings(DBRows.Data[0].Values['Objectives'],textobject)) then
-      WriteLn('"'+DBRows.Data[0].Values['Objectives']+'" XXXXX "'+textobject+'"');
-    if not (CompareStrings(DBRows.Data[0].Values['Details'],textdescription)) then
-      WriteLn('"'+DBRows.Data[0].Values['Details']+'" XXXXX "'+textdescription+'"');
-    if not (CompareStrings(DBRows.Data[0].Values['OfferRewardText'],textcomplection)) then
-      WriteLn('"'+DBRows.Data[0].Values['OfferRewardText']+'" XXXXX "'+textcomplection+'"');
-    if not (CompareStrings(DBRows.Data[0].Values['RequestItemsText'],textprogress)) then
-      WriteLn('"'+DBRows.Data[0].Values['RequestItemsText']+'" XXXXX "'+textprogress+'"');
-    if not (CompareStrings(DBRows.Data[0].Values['EndText'],textend)) then
-      WriteLn('"'+DBRows.Data[0].Values['EndText']+'" XXXXX "'+textend+'"');
-    if not (CompareStrings(DBRows.Data[0].Values['ObjectiveText1'],textobjective1)) then
-      WriteLn('"'+DBRows.Data[0].Values['ObjectiveText1']+'" XXXXX "'+textobjective1+'"');
-    if not (CompareStrings(DBRows.Data[0].Values['ObjectiveText2'],textobjective2)) then
-      WriteLn('"'+DBRows.Data[0].Values['ObjectiveText2']+'" XXXXX "'+textobjective2+'"');
-    if not (CompareStrings(DBRows.Data[0].Values['ObjectiveText3'],textobjective3)) then
-      WriteLn('"'+DBRows.Data[0].Values['ObjectiveText3']+'" XXXXX "'+textobjective3+'"');
-    if not (CompareStrings(DBRows.Data[0].Values['ObjectiveText4'],textobjective4)) then
-      WriteLn('"'+DBRows.Data[0].Values['ObjectiveText4']+'" XXXXX "'+textobjective4+'"');
-    }
     if (DBRows.Count > 0) then
     if (
@@ -381 +353 @@
   end;
 //  else   WriteLn('guest='+IntToStr(Id)+' Nenalezen');
+
+  except
+     on E: EIdHTTPProtocolException do
+     begin
+       if E.ErrorCode = 404 then
+         foundtext := false;
+
+     end;
+      on E:Exception do
+        GetTextQuest(Id);
+   //  on E: EIdSocketError do then
+  //       foundtext := false;
+  //   end;
+  end;
 end;
 
@@ -388 +374 @@
   i:integer;
 begin
-  GetTextQuest(3721);
-  GetTextQuest(4970);
-  GetTextQuest(5501);
-
-
-
-
-  for i := 6032 to GetMaxIDQuest do begin
+  GetTextQuest(12996);
+  GetTextQuest(13105);
+
+  GetTextQuest(13164);
+
+  GetTextQuest(13358);
+
+  GetTextQuest(13375);
+
+  GetTextQuest(13369);
+
+  GetTextQuest(13425);
+
+  GetTextQuest(13675);
+
+  GetTextQuest(13426);
+
+
+
+
+  for i := 12865 to GetMaxIDQuest do begin
     GetTextQuest(i);
     write('.');
@@ -471 +470 @@
        text := StringReplace(text,part+'&gt;',part2,[rfReplaceAll, rfIgnoreCase]);
      end;
+     text := StringReplace(text,'&lt;','<',[rfIgnoreCase]);
+     text := StringReplace(text,'&gt;','>',[rfIgnoreCase]);
    end;
-  until not (Pos('/',part) > 0);
+  until not (Pos('&lt;',text) > 0);
 
 
@@ -526 +527 @@
   if ((textdb = textimport) or ( (textdb <> '') and (textimport = '') )) then Result := true
   else begin
+    //TODO: smazat celé $g pro porovnání
     Result:=false;
     WriteLn(textdb);