Project

General

Profile

« Previous | Next » 

Revision 4439

Added by daigle over 15 years ago

Get an instance of XMLSchemaService when refreshing.

View differences:

src/edu/ucsb/nceas/metacat/SchemaLocationResolver.java
53 53
54 54 
  private String nameSpace = null; //public id
55 55 
  private String schemaLocation = null; // system id
56 
//  private Vector<String> nameSpaceList = new Vector<String>();// name space in the table
57 
//  private String nameSpaceAndLocationString = ""; // the parameter will be set
58 
//                                              // in external property in parser
59 
  //private String schemaFileName = null;
60 
  // constant
61 
  //private String SCHEMATYPE ="Schema";
62 56 
  private String WHITESPACESTRING =" ";
63 57 
  private boolean downloadNewSchema = false;
64 58 

  		




  ......




  110
  104
  
    
        InputStream in = DBEntityResolver.checkURLConnection(schemaLocation);


  		




  111
  105
  
    
       


  		




  112
  106
  
    
        String newURLInMetacat = uploadSchemaFromURL(in);


  		




  113
  
  
    
        XMLSchemaService.refresh();


  		




  
  107
  
    
        XMLSchemaService.getInstance().refresh();


  		




  114
  108
  
    
       


  		




  115
  109
  
    
        // check the name space list again.  It may not have appeared the first time 


  		




  116
  110
  
    
        // because the schema was in the db but there was no file on disk.  If that's 


  		




  ......




  118
  112
  
    
        // to register the schema in the database.


  		




  119
  113
  
    
        if (!XMLSchemaService.getNameSpaceList().contains(nameSpace)) {


  		




  120
  114
  
    
        	registerSchema(newURLInMetacat);


  		




  121
  
  
    
        	XMLSchemaService.refresh();


  		




  
  115
  
    
        	XMLSchemaService.getInstance().refresh();


  		




  122
  116
  
    
        }


  		




  123
  117
  
    
        downloadNewSchema = true;


  		




  124
  118
  
    
     


  		












Also available in:  Unified diff