Changeset 507 for trunk/src/find_imadoc.m

Timestamp:

Jul 29, 2012, 11:18:31 PM (12 years ago)

Author:

sommeria

Message:

various improvments and corrections
dtatatree_browser tested

File:

• trunk/src/find_imadoc.m (modified) (1 diff)

trunk/src/find_imadoc.m

@@ -13 +13 @@
 XmlFileName=[fullfile(RootPath,SubDirBase) '.xml'];%new convention: xml at the level of the image folder
 if ~exist(XmlFileName,'file')
-    if strcmp(FileExt,'.nc')
-        basexml=fullfile(RootPath,RootFile) ; % old convention: xml inside the image folder, case of civ files
-    else
-        basexml=fullfile(RootPath,SubDir,RootFile) ; % old convention: xml inside the image folder, case of images
-    end
-    XmlFileName=[basexml '.xml'];
+    XmlFileName=[fullfile(RootPath,SubDirBase,RootFile) '.xml']; % old convention: xml inside the image folder, case of images or new civ files
     if ~exist(XmlFileName,'file')
-        XmlFileName=[basexml '.civ']; % very old convention: .civ file
-        if ~exist(XmlFileName,'file')
-            XmlFileName='';
+        XmlFileName=[fullfile(RootPath,SubDirBase,RootFile) '.civ']; % very old convention: .civ file
+        if ~exist(XmlFileName,'file') && strcmp(FileExt,'.nc')
+            XmlFileName=[fullfile(RootPath,RootFile) '.xml'] ; % old convention: xml inside the image folder, old civ file opened
+            if ~exist(XmlFileName,'file')
+                XmlFileName=[fullfile(RootPath,RootFile) '.civ']; % very old convention: .civ file
+            end
         end
     end
 end
+if ~exist(XmlFileName,'file')
+    XmlFileName='';
+end