Changeset 55 for trunk/src/editxml.m

Timestamp:

Mar 17, 2010, 10:26:41 AM (15 years ago)

Author:

sommeria

Message:

-use of a single parameter file PARAM.xml (instead of PARAM_WIN and PARAM_LINUX).
-correction of a bug for opening an existing projection object
-manual editing of vectors made available with the builtin netcdf tool.
-bug fix for reading netcdf files with the builtin netcdf tool.

File:

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

trunk/src/editxml.m

@@ -185 +185 @@
     testupfile=0;
     DataIn=get(get(hObject,'parent'),'UserData');
-    if isfield(DataIn,'UpFile')&~isempty(DataIn.UpFile)
+    if isfield(DataIn,'UpFile')&&~isempty(DataIn.UpFile)
         [UpPath,UpName,UpExt]=fileparts(DataIn.UpFile{1});
         if isequal(UpExt,'.xml')
@@ -283 +283 @@
 CurrentFile=fullfile(PathName,FileName);
 sizf=size(CurrentFile);
-if (~ischar(CurrentFile)|~isequal(sizf(1),1)),return;end% keep only character strings as input file name
+if (~ischar(CurrentFile)||~isequal(sizf(1),1)),return;end% keep only character strings as input file name
 if exist(CurrentFile,'file')
 %     set(handles.CurrentAttributes,'UserDataIn',PathName); %store the path to the xml file
     [CurPath,CurName,CurExt]=fileparts(CurrentFile);
     if isequal(CurExt,'.xls')    
-        if isfield(DataIn,'hfig_xls')&ishandle(DataIn.hfig_xls)
+        if isfield(DataIn,'hfig_xls') && ishandle(DataIn.hfig_xls)
             [hfig_xls]=read_xls(CurrentFile,DataIn.hfig_xls);
         else
@@ -310 +310 @@
 t=xmltree(CurrentFile);%open the xml file 
 head_element=get(t,1);
-if ~isfield(head_element,'name') | ~isfield(head_element,'attributes')
+if ~isfield(head_element,'name') || ~isfield(head_element,'attributes')
     msgbox_uvmat('ERROR','root element of the .xml file not in correct format')
 end
@@ -317 +317 @@
 xstest=0;
 for iattr=1:length(head_attr)
-    if isequal(head_attr{iattr}.key,'xmlns:xsi')& isequal(head_attr{iattr}.val,'none')%no schema to read
+    if isequal(head_attr{iattr}.key,'xmlns:xsi')&& isequal(head_attr{iattr}.val,'none')%no schema to read
          xs=[];
 %          xstest=1;
     end
-    if isequal(head_attr{iattr}.key,'xsi:noNamespaceSchemaLocation') & exist(head_attr{iattr}.val,'file')
+    if isequal(head_attr{iattr}.key,'xsi:noNamespaceSchemaLocation') && exist(head_attr{iattr}.val,'file')
         DataIn.Schema=head_attr{iattr}.val;
         xs=xmltree(DataIn.Schema);%open the associated schema file
@@ -332 +332 @@
     path_uvmat=which('editxml');% check the path detected for source file uvmat
     path_UVMAT=fileparts(path_uvmat); %path to UVMAT
-%     if isunix
-xmlparam=fullfile(path_UVMAT,'PARAM.xml');
-if exist(xmlparam,'file')
-    tparam=xmltree(xmlparam);
-    sparam=convert(tparam);
-    if isfield(sparam,'SchemaPath')
-        schemapath=[fullfile(sparam.SchemaPath,head_name) '.xsd']
-    end 
-    if exist(fullfile(path_UVMAT,schemapath)
-        schemapath=fullfile(path_UVMAT,schemapath);%look for relative path definition
-    end
-    schemapath=fullfile(path_UVMAT,schemapath);
-%         schemapath=['/coriolis/papillon/data/civbin/XML_SCHEMAS/' head_name '.xsd']%current dir for schema
-%     else
-%         xmlparam=fullfile(path_UVMAT,'PARAM_WIN.xml')
-%         if exist(xmlparam,'file')
-%             tparam=xmltree(xmlparam);
-%             sparam=convert(tparam)
-%             if isfield(sparam,'SchemaPath')
-%                 schemapath=[fullfile(sparam.SchemaPath,head_name) '.xsd']
-%             end
-%         end 
-%         schemapath=['\\Papillon\data\civbin\XML_SCHEMAS\' head_name '.xsd']%current dir for schemas
-%     end
-    if exist(schemapath,'file')
-        xs=xmltree(schemapath);
-    else
-        msgbox_uvmat('ERROR',['The xml schema for ' CurrentFile ' is unknown, check the schema path set in the file PARAM.xml'])
-        [FileName, PathName]=uigetfile( ...
-       {'*.xsd', '(*.xsd)';
-        '*.xsd',  '.xsd files '; ...
-        '*.*',  'All Files (*.*)'}, ...
-        ['Pick a .xsd schema'] ,schemapath); %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
+    xmlparam=fullfile(path_UVMAT,'PARAM.xml');
+    if exist(xmlparam,'file')
+        tparam=xmltree(xmlparam);
+        sparam=convert(tparam);
+        if isfield(sparam,'SchemaPath')
+            schemafile=[fullfile(sparam.SchemaPath,head_name) '.xsd'];
+        end 
+        if ~exist(schemafile,'file')
+            schemafile=fullfile(path_UVMAT,schemafile);%look for relative path definition
+        end
+        if exist(schemafile,'file')
+            xs=xmltree(schemafile);
         else
-            xs=[];
+            msgbox_uvmat('ERROR',['The xml schema for ' CurrentFile ' is unknown, check the schema path set in the file PARAM.xml'])
+            [FileName, PathName]=uigetfile( ...
+           {'*.xsd', '(*.xsd)';
+            '*.xsd',  '.xsd files '; ...
+            '*.*',  'All Files (*.*)'}, ...
+            'Pick a .xsd schema' ,schemapath); %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
@@ -376 +363 @@
 if isempty(xs)
     displ_xml(handles,t,1,DataIn,get(hObject,'parent'));%no associated schema, default  display of the xml file
-%    set(handles.inport_file,'Visible','off')
-%    set(handles.RefFile,'Visible','off')
 else
     DataIn.xs_CurrentUid=find(xs,'/xs:schema/xs:element');%uid of the root element in the schema
@@ -383 +368 @@
         [element,subelem]=get_xml(t,path,xs_element,1,xs_subelem);% read the corresponding xml data
         update_list(handles,path,xs_element,element,1,xs_subelem,subelem);%update the display of information on the interface
-   % set(handles.inport_file,'Visible','on')
-   % set(handles.RefFile,'Visible','on')
 end
 set(heditxml,'UserData',DataIn);%store the new input xml file name
@@ -890 +873 @@
 end
 set(handles.element_value,'UserData',node)
-if ~testedit && isfield(element,'attrup') & isfield(element.attrup,'source')&& ~isequal(element.attrup.source,'manual')
+if ~testedit && isfield(element,'attrup') && isfield(element.attrup,'source')&& ~isequal(element.attrup.source,'manual')
      set(handles.element_value,'Enable','inactive')
 else