Advertisement
Guest User

Untitled

a guest
Nov 21st, 2012
337
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.93 KB | None | 0 0
  1. diff -Naur -b --strip-trailing-cr ./config2/config/search.js ./config/search.js
  2. --- ./config2/config/search.js  2007-04-18 17:35:54.000000000 +0400
  3. +++ ./config/search.js  2012-11-20 23:46:29.000000000 +0400
  4. @@ -253,6 +253,7 @@
  5.  // }
  6.  // Convert 2-byte numerics to 1-byte numerics
  7.     var arrNums="11,22,33,44,55,66,77,88,99,00".split(",");
  8. +   var mystring="";
  9.     for (var i = 0; i < arrNums.length; i++) {
  10.         re.compile(arrNums[i].substr(0,1), "g");
  11.         mystring = mystring.replace(re,arrNums[i].substr(1,1));
  12. diff -Naur -b --strip-trailing-cr ./config2/config/stdiodom.js ./config/stdiodom.js
  13. --- ./config2/config/stdiodom.js    2007-11-23 06:27:04.000000000 +0300
  14. +++ ./config/stdiodom.js    2012-11-21 23:42:45.000000000 +0400
  15. @@ -9,12 +9,12 @@
  16.     var UI_lang = parent.CTL.document.ctl.lang.value;
  17.     var xrefWin;
  18.    
  19. -htmlNavi_Dtc="";
  20. -htmlNavi_Sym="";
  21. -htmlSearch="";
  22. -htmlSearch_Dtc="";
  23. -htmlSearch_Sym="";
  24. -htmlMods_List="";
  25. +var htmlNavi_Dtc="";
  26. +var htmlNavi_Sym="";
  27. +var htmlSearch="";
  28. +var htmlSearch_Dtc="";
  29. +var htmlSearch_Sym="";
  30. +var htmlMods_List="";
  31.  
  32.  
  33.  if (window.ActiveXObject) {
  34. @@ -81,7 +81,7 @@
  35.     }
  36.     else if (window.XSLTProcessor) {
  37.     // load styleNavi_Dtc and get transform in string htmlNavi_Dtc
  38. -       xSrcDtc = xmlLoad_ff("../webdocstructure-dtc.xml");
  39. +       var xSrcDtc = xmlLoad_ff("../webdocstructure-dtc.xml");
  40.         var xDoc = xmlLoad_ff("../../config/navi-dtc-e.xslt");
  41.         xsltProcessor.reset();
  42.         xsltProcessor.importStylesheet(xDoc);
  43. @@ -98,6 +98,7 @@
  44.     }
  45.     else if (window.XSLTProcessor) {
  46.     // load styleSearch_Dtc and get transform in string htmlSearch_Dtc
  47. +       var xSrcDtc = xmlLoad_ff("../webdocstructure-dtc.xml");
  48.         var xDoc = xmlLoad_ff("../../config/search-dtc-e.xslt");
  49.         xsltProcessor.reset();
  50.         xsltProcessor.importStylesheet(xDoc);
  51. @@ -115,7 +116,7 @@
  52.     }
  53.     else if (window.XSLTProcessor) {
  54.     // load styleNavi_Sym and get transform in string htmlNavi_Sym
  55. -       xSrcSym = xmlLoad_ff("../webdocstructure-sym.xml");
  56. +       var xSrcSym = xmlLoad_ff("../webdocstructure-sym.xml");
  57.         var xDoc = xmlLoad_ff("../../config/navi-sym-e.xslt");
  58.         xsltProcessor.reset();
  59.         xsltProcessor.importStylesheet(xDoc);
  60. @@ -132,6 +133,7 @@
  61.     }
  62.     else if (window.XSLTProcessor) {
  63.     // load styleSearch_Sym and get transform in string htmlSearch_Sym
  64. +       var xSrcSym = xmlLoad_ff("../webdocstructure-sym.xml");
  65.         var xDoc = xmlLoad_ff("../../config/search-sym-e.xslt");
  66.         xsltProcessor.reset();
  67.         xsltProcessor.importStylesheet(xDoc);
  68. @@ -241,10 +243,10 @@
  69.  }
  70.  
  71.  function xmlLoad_ff(strFile) {
  72. -   var xDoc = document.implementation.createDocument("", "", null);
  73. -   xDoc.async = false;
  74. -   xDoc.load(strFile);
  75. -   return xDoc;
  76. +   var xDoc = new XMLHttpRequest();
  77. +   xDoc.open('GET',strFile,false);
  78. +   xDoc.send(null);
  79. +   return xDoc.responseXML;
  80.  }
  81.  
  82.  
  83. diff -Naur -b --strip-trailing-cr ./config2/config/stdio.js ./config/stdio.js
  84. --- ./config2/config/stdio.js   2008-06-20 10:15:00.000000000 +0400
  85. +++ ./config/stdio.js   2012-11-21 23:58:09.000000000 +0400
  86. @@ -237,16 +237,18 @@
  87.             var xsltProcessor_main = new XSLTProcessor();
  88.             var serializer_main = new XMLSerializer();
  89.            
  90. -           var xDoc_main = document.implementation.createDocument("", "", null);
  91. -           xDoc_main.async = false;
  92. -           xDoc_main.load("../../config/suzuki_all.xsl");
  93. -           xsltProcessor_main.importStylesheet(xDoc_main);
  94. +           var xDoc_main = new XMLHttpRequest();
  95. +           xDoc_main.open('GET',"../../config/suzuki_all.xsl",false);
  96. +           xDoc_main.send(null);
  97. +           xsltProcessor_main.importStylesheet(xDoc_main.responseXML);
  98.             xsltProcessor_main.setParameter("", "UI_lang", UI_lang);
  99.         }
  100. -       var srcMain = document.implementation.createDocument("", "", null);
  101. -       srcMain.async = false;
  102. -       srcMain.load(strSource);
  103. -       xslMainDoc = xsltProcessor_main.transformToDocument(srcMain);
  104. +       var srcMain = new XMLHttpRequest();
  105. +       srcMain.open('GET',strSource,false);
  106. +       srcMain.send(null);
  107. +       //alert("file:"+file+"\nstate:"+srcMain.readyState+"\nstatus:"+srcMain.status+"\nresponse:"+srcMain.responseText);
  108. +       xslMainDoc = xsltProcessor_main.transformToDocument(srcMain.responseXML);
  109. +
  110.         htmlMain = serializer_main.serializeToString(xslMainDoc);  
  111.         parent.MAIN.document.write(htmlMain);
  112.         parent.MAIN.document.close();
  113. @@ -350,17 +352,25 @@
  114.                 var xsltProcessor_main = new XSLTProcessor();
  115.                 var serializer_main = new XMLSerializer();
  116.                
  117. -               var xDoc_main = document.implementation.createDocument("", "", null);
  118. -               xDoc_main.async = false;
  119. -               xDoc_main.load("../../config/suzuki_all.xsl");
  120. -               xsltProcessor_main.importStylesheet(xDoc_main);
  121. +               try //Firefox
  122. +               {
  123. +               var xDoc_main = new XMLHttpRequest();
  124. +               xDoc_main.open('GET',"../../config/suzuki_all.xsl",false);
  125. +               xDoc_main.send(null);
  126. +               xsltProcessor_main.importStylesheet(xDoc_main.responseXML);
  127.                 xsltProcessor_main.setParameter("", "UI_lang", UI_lang);
  128.             }
  129. -           var srcMain = document.implementation.createDocument("", "", null);
  130. -           srcMain.async = false;
  131. -           srcMain.load(file);
  132. -           xslMainDoc = xsltProcessor_main.transformToDocument(srcMain);
  133. +               catch(e) {alert(e.message)}
  134. +           }
  135. +           var srcMain = new XMLHttpRequest();
  136. +           srcMain.open('GET',file,false);
  137. +           srcMain.send(null);
  138. +           //alert("file:"+file+"\nstate:"+srcMain.readyState+"\nstatus:"+srcMain.status+"\nresponse:"+srcMain.responseText);
  139. +           xslMainDoc = xsltProcessor_main.transformToDocument(srcMain.responseXML);
  140.             htmlMain = serializer_main.serializeToString(xslMainDoc);  
  141. +           //delete xDoc_main;
  142. +           //delete xsltProcessor_main;
  143. +           //delete serializer_main;
  144.         }
  145.     }
  146.  
  147. @@ -640,16 +650,17 @@
  148.                 var xsltProcessor_main = new XSLTProcessor();
  149.                 var serializer_main = new XMLSerializer();
  150.                
  151. -               var xDoc_main = document.implementation.createDocument("", "", null);
  152. -               xDoc_main.async = false;
  153. -               xDoc_main.load("../../config/suzuki_all.xsl");
  154. -               xsltProcessor_main.importStylesheet(xDoc_main);
  155. +               var xDoc_main = new XMLHttpRequest();
  156. +               xDoc_main.open('GET',"../../config/suzuki_all.xsl",false);
  157. +               xDoc_main.send(null);
  158. +               xsltProcessor_main.importStylesheet(xDoc_main.responseXML);
  159.                 xsltProcessor_main.setParameter("", "UI_lang", UI_lang);
  160.             }
  161. -           var srcMain = document.implementation.createDocument("", "", null);
  162. -           srcMain.async = false;
  163. -           srcMain.load(file);
  164. -           xslMainDoc = xsltProcessor_main.transformToDocument(srcMain);
  165. +           var srcMain = new XMLHttpRequest();
  166. +           srcMain.open('GET',file,false);
  167. +           srcMain.send(null);
  168. +           //alert("file:"+file+"\nstate:"+srcMain.readyState+"\nstatus:"+srcMain.status+"\nresponse:"+srcMain.responseText);
  169. +           xslMainDoc = xsltProcessor_main.transformToDocument(srcMain.responseXML);
  170.             htmlMain = serializer_main.serializeToString(xslMainDoc);  
  171.         }
  172.     }
  173. @@ -922,18 +933,19 @@
  174.                 var xsltProcessor_main = new XSLTProcessor();
  175.                 var serializer_main = new XMLSerializer();
  176.                
  177. -               var xDoc_main = document.implementation.createDocument("", "", null);
  178. -               xDoc_main.async = false;
  179. -               xDoc_main.load("../../config/toollist.xsl");
  180. -               xsltProcessor_main.importStylesheet(xDoc_main);
  181. +               var xDoc_main = new XMLHttpRequest();
  182. +               xDoc_main.open('GET',"../../config/toollist.xsl",false);
  183. +               xDoc_main.send(null);
  184. +               xsltProcessor_main.importStylesheet(xDoc_main.responseXML);
  185.                 xsltProcessor_main.setParameter("", "tgtTool", tnum);
  186.                 xsltProcessor_main.setParameter("", "tb", tb);
  187.                 xsltProcessor_main.setParameter("", "dc", dc);
  188.             }
  189. -           var srcMain = document.implementation.createDocument("", "", null);
  190. -           srcMain.async = false;
  191. -           srcMain.load(listPath);
  192. -           xslMainDoc = xsltProcessor_main.transformToDocument(srcMain);
  193. +           var srcMain = new XMLHttpRequest();
  194. +           srcMain.open('GET',listPath,false);
  195. +           srcMain.send(null);
  196. +           //alert("file:"+file+"\nstate:"+srcMain.readyState+"\nstatus:"+srcMain.status+"\nresponse:"+srcMain.responseText);
  197. +           xslMainDoc = xsltProcessor_main.transformToDocument(srcMain.responseXML);
  198.             htmlMain = serializer_main.serializeToString(xslMainDoc);  
  199.         }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement