/ - Diff - Metacat - Ecoinformatics Redmine

             // system id may not have server url on front.  Add it if not.
             String systemID = rs.getString(5);
             if (!systemID.startsWith("http://")) {
             	systemID = SystemUtil.getServerURL() + systemID;
             	systemID = SystemUtil.getContextURL() + systemID;
+            }
             sb.append("</public_id><system_id>").append(systemID);
             sb.append("</system_id></row>");

     package edu.ucsb.nceas.metacat;
     import java.io.File;
     import java.io.IOException;
     import java.util.Hashtable;
     import edu.ucsb.nceas.utilities.Options;
     import edu.ucsb.nceas.metacat.service.PropertyService;
     import edu.ucsb.nceas.metacat.service.ServiceException;
     import edu.ucsb.nceas.utilities.PropertyNotFoundException;
     /**
-...
         public static void main(String[] args)
+        {
             String CONFIG_DIR = "lib";
             String CONFIG_NAME = "metacat.properties";
             File dirPath = new File(CONFIG_DIR);
             File propertyFile = new File(dirPath, CONFIG_NAME);
             Options options = null;
             try {
                 options = Options.initialize(propertyFile);
             } catch (IOException ioe) {
                 System.err.println("Error in loading options: "
             	PropertyService.getInstance(dirPath.getPath());
             } catch (ServiceException ioe) {
                 System.err.println("Error in loading properties: "
                         + ioe.getMessage());
+            }

                         this.system_id = rs.getString(1);
                         // system id may not have server url on front.  Add it if not.
                         if (!system_id.startsWith("http://")) {
                         	system_id = SystemUtil.getServerURL() + system_id;
                         	system_id = SystemUtil.getContextURL() + system_id;
+                        }
                         this.validateType = rs.getString(2);

             systemID = rs.getString(1);
             // system id may not have server url on front.  Add it if not.
             if (!systemID.startsWith("http://")) {
             	systemID = SystemUtil.getServerURL() + systemID;
             	systemID = SystemUtil.getContextURL() + systemID;
+            }
           } else {
             throw new SQLException("Non-registered doctype: " + doctype);

src/edu/ucsb/nceas/metacat/DBEntityResolver.java
213	213	systemid = rs.getString(1);
214	214	// system id may not have server url on front. Add it if not.
215	215	if (!systemid.startsWith("http://")) {
216		systemid = SystemUtil.getServerURL() + systemid;
	216	systemid = SystemUtil.getContextURL() + systemid;
217	217	}
218	218	}
219	219	stmt.close();

     				// system id may not have server url on front. Add it if not.
     				if (!location.startsWith("http://")) {
     					try {
     						location = SystemUtil.getServerURL() + location;
     						location = SystemUtil.getContextURL() + location;
     					} catch (PropertyNotFoundException pnfe) {
     						throw new SQLException("Could not find property: "
     								+ pnfe.getMessage());

src/edu/ucsb/nceas/metacat/AccessControlList.java
948	948	systemID = rs.getString(1);
949	949	// system id may not have server url on front. Add it if not.
950	950	if (!systemID.startsWith("http://")) {
951		systemID = SystemUtil.getServerURL() + systemID;
	951	systemID = SystemUtil.getContextURL() + systemID;
952	952	}
953	953	}
954	954

Metacat