Changeset 672 for trunk/src/find_imadoc.m

Timestamp:

Aug 6, 2013, 3:47:07 PM (11 years ago)

Author:

sommeria

Message:

various bugs corrected

File:

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

trunk/src/find_imadoc.m

@@ -10 +10 @@
 % RootPath,SubDir,RootFile,FileExt, as given from the input file name by fileparts_uvmat
 function XmlFileName=find_imadoc(RootPath,SubDir,RootFile,FileExt)
-SubDirBase=regexprep(SubDir,'\..*','');%take the root part of SubDir, before the first dot '.'
-XmlFileName=[fullfile(RootPath,SubDirBase) '.xml'];%new convention: xml at the level of the image folder
+SubDirBase=SubDir;
+XmlFileName=fullfile(RootPath,[SubDir '.xml']);
+if ~exist (XmlFileName,'file')
+    dotchar=regexp(SubDir,'\.');
+    for idot=1:numel(dotchar)
+        XmlFileName=fullfile(RootPath,[SubDir(1:dotchar(end-idot+1)) '.xml']);
+        if exist(XmlFileName,'file')
+            SubDirBase=fullfile(RootPath,SubDir(1:dotchar(end-idot+1)));
+            break
+        end
+    end   
+end
+% SubDirBase=regexprep(SubDir,'\..*','');%take the root part of SubDir, before the first dot '.'
+% XmlFileName=[fullfile(RootPath,SubDirBase) '.xml'];%new convention: xml at the level of the image folder
 if ~exist(XmlFileName,'file')
     XmlFileName=[fullfile(RootPath,SubDirBase,RootFile) '.xml']; % old convention: xml inside the image folder, case of images or new civ files