Changeset 508 for trunk/src/editxml.m

Timestamp:

Jul 31, 2012, 6:55:39 PM (12 years ago)

Author:

sommeria

Message:

various improvements

File:

• trunk/src/editxml.m (modified) (2 diffs)

trunk/src/editxml.m

@@ -55 +55 @@
 % set(handles.replicate,'String',['copy';'<---'])
 if nargin
-    CurrentFile=varargin{1}
+    CurrentFile=varargin{1};
 else
     CurrentFile=[];
@@ -330 +330 @@
     head_name=get(t,1,'name');
     %Path to shemas:
-    path_uvmat=which('editxml');% check the path detected for source file uvmat
-    path_UVMAT=fileparts(path_uvmat); %path to UVMAT
+    path_uvmat=fileparts(which('editxml'));% check the path detected for source file uvmat
+    % path_UVMAT=fileparts(path_uvmat); %path to UVMAT
     %     xmlparam=fullfile(path_UVMAT,'PARAM.xml');
-    xmlparam='PARAM.xml'; %will find PARAM.xml whose path is set in priority
-    if exist(xmlparam,'file')
-        tparam=xmltree(xmlparam);
-        sparam=convert(tparam);
-        if isfield(sparam,'SchemaPath')
-            schemafile=[fullfile(sparam.SchemaPath,head_name) '.xsd'];           
-            if ~exist(schemafile,'file')
-                schemafile=fullfile(path_UVMAT,schemafile);%look for relative path definition
-            end
-            if exist(schemafile,'file')
-                xs=xmltree(schemafile);
-            else
-                msgbox_uvmat('ERROR',['The needed xml schema  ' sparam.SchemaPath ' is not found, check the file PARAM.xml'])
-                [FileName, PathName]=uigetfile( ...
-                    {'*.xsd', '(*.xsd)';
-                    '*.xsd',  '.xsd files '; ...
-                    '*.*',  'All Files (*.*)'}, ...
-                    'Pick a .xsd schema' ,schemafile); %file browser
-                if ischar(PathName) && ischar(FileName) && exist(fullfile(PathName,FileName),'file')
-                    DataIn.Schema=fullfile(PathName,FileName);
-                    xs=xmltree(DataIn.Schema);%open the associated schema file
-                else
-                    xs=[];
-                end
-            end
-        end
-    end
+    %     xmlparam='PARAM.xml'; %will find PARAM.xml whose path is set in priority
+    %     if exist(xmlparam,'file')
+    %         tparam=xmltree(xmlparam);
+    %         sparam=convert(tparam);
+    %         if isfield(sparam,'SchemaPath')
+    schemafile=[fullfile(path_uvmat,'xml_shemas',head_name) '.xsd'];
+    if ~exist(schemafile,'file')
+        schemafile=fullfile(path_UVMAT,schemafile);%look for relative path definition
+    end
+    if exist(schemafile,'file')
+        xs=xmltree(schemafile);
+    else
+        msgbox_uvmat('ERROR',['The needed xml schema  ' sparam.SchemaPath ' is not found, check the file PARAM.xml'])
+        [FileName, PathName]=uigetfile( ...
+            {'*.xsd', '(*.xsd)';
+            '*.xsd',  '.xsd files '; ...
+            '*.*',  'All Files (*.*)'}, ...
+            'Pick a .xsd schema' ,schemafile); %file browser
+        if ischar(PathName) && ischar(FileName) && exist(fullfile(PathName,FileName),'file')
+            DataIn.Schema=fullfile(PathName,FileName);
+            xs=xmltree(DataIn.Schema);%open the associated schema file
+        else
+            xs=[];
+        end
+    end
+    %         end
+    %     end
 end
 DataIn.CurrentUid=1;