sageplugins-commic

[jreichen <jre...@us...>]

Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv20124/net/sf/sageplugins/webserver

Modified Files:
	XmlImporterServlet.java 
Log Message:
- An error "is not a valid directory on the server" was displayed on the XML Importer if the user didn't want to import from a directory of XML files and left the directory name blank.

Index: XmlImporterServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/XmlImporterServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** XmlImporterServlet.java	17 Jul 2010 15:03:34 -0000	1.6
--- XmlImporterServlet.java	14 Mar 2011 00:30:24 -0000	1.7
***************
*** 319,323 ****
                  }
                  // import for mediafile
!                 if ( directoryXml != null ) {
                      out.println("Error: directory import feature cannot be used when attaching to a single media file");
                      out.println("</div>");//content
--- 319,323 ----
                  }
                  // import for mediafile
!                 if ( (directoryXml != null ) && (directoryXml.trim().length() > 0)) {
                      out.println("Error: directory import feature cannot be used when attaching to a single media file");
                      out.println("</div>");//content
***************
*** 385,389 ****
                  ArrayList<SageXmlReader> listOfXMLFiles = new ArrayList<SageXmlReader>();
                  
!                 if(directoryXml != null){
                      //Process an entire folder structure
                      File directory = new File(directoryXml);
--- 385,389 ----
                  ArrayList<SageXmlReader> listOfXMLFiles = new ArrayList<SageXmlReader>();
                  
!                 if((directoryXml != null) && (directoryXml.trim().length() > 0)){
                      //Process an entire folder structure
                      File directory = new File(directoryXml);