/ - Diff - Metacat - Ecoinformatics Redmine

         private CoreContainer coreContainer = null;
         private String collectionName = null;
         private SolrCore solrCore = null;
         private Map<String, SchemaField> fieldMap = null;
         private IndexSchema schema = null;
         private List<String> validSolrFieldNames = null;
         private String solrSpecVersion = "";
         /**
          * Constructor.
          * @param solrServer

     import java.util.Map;
     import java.util.Set;
     import javax.xml.parsers.DocumentBuilder;
     import javax.xml.parsers.DocumentBuilderFactory;
     import javax.xml.parsers.ParserConfigurationException;
     import javax.xml.xpath.XPathConstants;
     import javax.xml.xpath.XPathFactory;
     import org.apache.commons.codec.net.URLCodec;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
-...
     import org.apache.solr.common.params.SolrParams;
     import org.apache.solr.schema.SchemaField;
     import org.dataone.configuration.Settings;
     import org.dataone.service.exceptions.NotFound;
     import org.dataone.service.exceptions.NotImplemented;
     import org.dataone.service.types.v1.Subject;
     import org.w3c.dom.Document;
     import org.w3c.dom.Node;
     import org.w3c.dom.NodeList;
     import org.xml.sax.SAXException;
-...
      */
     public class HttpSolrQueryService extends SolrQueryService {
         private static final String SELECTIONPHASE = "/select";
         private static final String SOLR_SYSTEMINFO_URLAPPENDIX = "solr.systeminfo.urlappendix";
         private static final String SOLR_SCHEMA_URLAPPENDIX = "sorl.schema.urlappendix";
         private static final String SPEC_PATH = "//str[@name=\"solr-spec-version\"]";
         private String solrServerBaseURL = null;
         private CommonsHttpSolrServer httpSolrServer = null;
-...
             return null;
+        }
         /**
          * Get the list of the valid field name (moved the fields names of the CopyFieldTarget).
          * @return
          */
         public List<String> getValidSchemaField() {
             return null;
+        }
         /**
          * Get the version of the solr server.
          * @return
          */
         public String getSolrServerVersion() {
             return null;
             if(solrSpecVersion == null) {
                 getHttpSolrServerVersion();
+            }
             return solrSpecVersion;
+        }
         /*
          * Get the solr server version from the system information url.
          */
         private void getHttpSolrServerVersion() {
             String systemInfoUrlAppendix = Settings.getConfiguration().getString(SOLR_SYSTEMINFO_URLAPPENDIX);
             String systemInfoUrl = solrServerBaseURL+systemInfoUrlAppendix;
             try {
                 Document doc = transformInputStreamToDoc((new URL(systemInfoUrl)).openStream());
                 NodeList nodeList = (NodeList) XPathFactory.newInstance().newXPath()
                                 .evaluate(SPEC_PATH, doc, XPathConstants.NODESET);
                 if(nodeList != null && nodeList.getLength() >0) {
                     Node specNode = nodeList.item(0);
                     solrSpecVersion = specNode.getFirstChild().getNodeValue();
                 } else {
                     solrSpecVersion = UNKNOWN;
+                }
             } catch (Exception e) {
                 log.error("HttpSolrQueryService.getHttpSolrServerVersion - can't get the solr specification version since "+e.getMessage());
                 solrSpecVersion = UNKNOWN;
+            }
+        }
         /**
          * Get the list of the valid field name (moved the fields names of the CopyFieldTarget).
          * Generate a Document from the InputStream
          * @param input
          * @return
          * @throws ParserConfigurationException
          * @throws SAXException
          * @throws IOException
          */
         public List<String> getValidSchemaField() {
             return null;
         private Document transformInputStreamToDoc(InputStream input) throws ParserConfigurationException, SAXException, IOException {
             DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
             DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
             Document doc = dBuilder.parse(input);
             return doc;
+        }
+    }

         private static Log log = LogFactory.getLog(SolrQueryService.class);
         private static List<String> supportedWriterTypes = null;
         protected Map<String, SchemaField> fieldMap = null;
         protected List<String> validSolrFieldNames = null;
         protected String solrSpecVersion = null;
         static {
             supportedWriterTypes = new ArrayList<String>();
             supportedWriterTypes.add(SolrQueryResponseWriterFactory.CSV);

metacat-common/src/main/java/edu/ucsb/nceas/metacat/common/query/SolrQueryServiceController.java
116	116	}
117	117
118	118	}
	119
	120	/**
	121	* Get the spec version of the solr server
	122	* @return
	123	*/
	124	public String getSolrSpecVersion() {
	125	if(isEmbeddedSolrServer) {
	126	return embeddedQueryService.getSolrServerVersion();
	127	} else {
	128	return httpQueryService.getSolrServerVersion();
	129	}
	130	}
119	131
120	132
121	133	}

Project

General

Profile

Metacat

Revision 7727

Added by Jing Tao over 11 years ago