Changeset 383 for ps

Timestamp:

06/03/04 15:27:01 (21 years ago)

Author:

Simon Brenner

Message:

Use the VFS wrapper instead of Xerces' local file input source

Location:

ps/trunk/source/simulation

Files:

• BaseEntity.cpp (modified) (4 diffs)
• BaseEntityCollection.cpp (modified) (1 diff)

ps/trunk/source/simulation/BaseEntity.cpp

@@ -3 +3 @@
 #include "CStr.h"
 
-// xerces XML stuff
-#include <xercesc/dom/DOM.hpp>
-#include <xercesc/parsers/XercesDOMParser.hpp>
-#include <xercesc/framework/LocalFileInputSource.hpp>
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/PlatformUtils.hpp>
-
-// Gee's custom error handler
-#include "ps/XercesErrorHandler.h"
+#include "XML.h"
 
 // automatically use namespace ..
@@ -60 +52 @@
         CXercesErrorHandler *errorHandler = new CXercesErrorHandler();
         parser->setErrorHandler(errorHandler);
+        
+        CVFSEntityResolver *entityResolver = new CVFSEntityResolver(filename);
+        parser->setEntityResolver(entityResolver);
 
         // Get main node
-        LocalFileInputSource source( XMLString::transcode(filename) );
+        CVFSInputSource source;
+        parseOK=source.OpenFile(filename)==0;
+        
+        if (parseOK)
+        {
+            // Parse file
+            parser->parse(source);
 
-        // Parse file
-        parser->parse(source);
-
-        // Check how many errors
-        parseOK = parser->getErrorCount() == 0;
+            // Check how many errors
+            parseOK = parser->getErrorCount() == 0;
+        }
 
         if (parseOK) {
@@ -76 +75 @@
 
             // root_name should be Object
-            CStr root_name = XMLString::transcode( element->getNodeName() );
+            CStr root_name = XMLTranscode( element->getNodeName() );
 
             // should have at least 3 children - Name, ModelName and TextureName
@@ -152 +151 @@
 
         }
+        delete parser;
         delete errorHandler;
-        delete parser;
+        delete entityResolver;
     }
     XMLPlatformUtils::Terminate();

ps/trunk/source/simulation/BaseEntityCollection.cpp

@@ -11 +11 @@
     vfsDirEnt dent;
     
-    CStr pathname = "mods/official/entities/templates/";
-    handle=vfs_open_dir("entities/templates/");
+    CStr pathname = "entities/templates/";
+    handle=vfs_open_dir(pathname.c_str());
     if (handle > 0)
     {