Changeset 3538

Timestamp:

04/30/07 18:04:35 (6 years ago)

Author:

balister

Message:

Fix path calculation for prf and scd files. They now use the path of the spd file that references them.

Location:

ossie/trunk/ossie

Files:

• framework/ApplicationFactory_impl.cpp (modified) (2 diffs)
• framework/DeviceManager_impl.cpp (modified) (2 diffs)
• framework/helperFunctions.cpp (modified) (3 diffs)
• include/ossie/ossieSupport.h (modified) (1 diff)

ossie/trunk/ossie/framework/ApplicationFactory_impl.cpp

@@ -670 +670 @@
         spdFile->close();
 
-        CF::File_var scdFile = fileMgr->open(spd.getSoftPkgName(), true);
+        std::string scdPath;
+        CF::File_var scdFile = fileMgr->open(ossieSupport::spd_rel_file(component->getSPDFile(),spd.getSoftPkgName(), scdPath), true);
         SCDParser scd(scdFile);
         scdFile->close();
@@ -687 +688 @@
         
         // Extract Properties
-        CF::File_var prfFile = fileMgr->open(spd.getPRFFile(), true);
+        std::string prfPath;
+        CF::File_var prfFile = fileMgr->open(ossieSupport::spd_rel_file(component->getSPDFile(), spd.getPRFFile(), prfPath), true);
         PRFParser prf(prfFile);
         prfFile->close();

ossie/trunk/ossie/framework/DeviceManager_impl.cpp

@@ -165 +165 @@
         tempDevice->initialize ();
         
-        //Get properties from SPD
-    if (strlen(_SPDParser.getPRFFile ()) > 0){
-        DEBUG(7, DevMgr, "getting PRF file: "<<_SPDParser.getPRFFile ());
-            CF::File_var prfFile = _fileSys->open(_SPDParser.getPRFFile (), true);
+        if (strlen(_SPDParser.getPRFFile ()) > 0){
+            DEBUG(7, DevMgr, "getting PRF file: "<<_SPDParser.getPRFFile ());
+
+            //Get properties from SPD
+            std::string prfFilePath;
+            CF::File_var prfFile = _fileSys->open(ossieSupport::spd_rel_file(_DCDParser.getFileNameFromRefId(componentPlacements[i].refId()), _SPDParser.getPRFFile (), prfFilePath), true);
             PRFParser _PRFparser (prfFile);
             prfFile->close();
-        
+            
             std::vector <PRFProperty *> *prfSimpleProp = _PRFparser.getConfigureProperties ();
             CF::Properties configCapacities;
@@ -178 +180 @@
                 configCapacities[i] = *((*prfSimpleProp)[i]->getDataType ());
             }
-        
+            
             //configure properties
             DEBUG(3, DevMgr, "Configuring capacities");
             tempDevice->configure (configCapacities);
-    }
+        }
+
         DEBUG(3, DevMgr, "Registering device");
         registerDevice (CF::Device::_duplicate(tempDevice));

ossie/trunk/ossie/framework/helperFunctions.cpp

@@ -25 +25 @@
 #include <boost/filesystem/path.hpp>
 
+namespace fs = boost::filesystem;
+
 #include <ossie/ossieSupport.h>
 
@@ -37 +39 @@
 {
     try {
-        boost::filesystem::path testPath(fileName, boost::filesystem::portable_posix_name);
+        fs::path testPath(fileName, fs::portable_posix_name);
     } catch (...) {
         return false;
@@ -44 +46 @@
     return true;
 }
+
+const char * ossieSupport::spd_rel_file(const char *spdFile, const char *name, std::string &fileName)
+{
+
+    fs::path spdPath(spdFile);
+
+    fs::path filePath = spdPath.branch_path() / name;
+
+    fileName = filePath.string();
+
+    return fileName.c_str();
+}

ossie/trunk/ossie/include/ossie/ossieSupport.h

@@ -218 +218 @@
    void createProfileFromFileName(std::string fileName, std::string &profile);
    bool isValidFileName(const char* fileName);
+   const char *spd_rel_file(const char *spdfile, const char *name, std::string &fileName);
+
 }  // Close ossieSupport Namespace
 #endif