[Dlsciences-dlese-tools] dlese-tools-project/src/org/dlese/dpc/schemedit/dcs DcsDataFileIndexingPlugin.java, 1.25, 1.26,

[Jonathan O. <os...@us...>]

Update of /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/dcs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2052

Modified Files:
	DcsDataFileIndexingPlugin.java 
Log Message:
url now indexed by xmlFile indexer

Index: DcsDataFileIndexingPlugin.java
===================================================================
RCS file: /cvsroot/dlsciences/dlese-tools-project/src/org/dlese/dpc/schemedit/dcs/DcsDataFileIndexingPlugin.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** DcsDataFileIndexingPlugin.java	16 Jul 2008 22:18:05 -0000	1.25
--- DcsDataFileIndexingPlugin.java	1 Dec 2008 20:33:54 -0000	1.26
***************
*** 142,154 ****
  				Field.Store.YES, Field.Index.UN_TOKENIZED));
  
- 		String url = getRecordUrl(id, file);
- 		if (url != null) {
- 			// prtln("\tURL (dcsurlenc): " + url);
- 			String urlenc = SimpleLuceneIndex.encodeToTerm(url);
- 			newDoc.add(new Field(FIELD_NS + "urlenc", urlenc, Field.Store.NO, Field.Index.TOKENIZED));
- 		}
  	}
  	
- 	
   	private String getFullName (String userName) {
  		try {
--- 142,147 ----
***************
*** 164,220 ****
  			return Constants.UNKNOWN_USER;
  	}
- 	
- 	private MetaDataFramework getMetaDataFramework (String xmlFormat) throws Exception {
- 		FrameworkRegistry reg =
- 			(FrameworkRegistry) getServletContext().getAttribute("frameworkRegistry");
- 		if (reg == null) {
- 			throw new Exception("WARNING: frameworkRegistry not found by getRecordUrl()");
- 		}
- 		return  reg.getFramework(xmlFormat);
- 	}
- 	
-  	private XMLDocReader getDocReader (String id) throws Exception {
- 		RepositoryManager rm =
- 			(RepositoryManager) getServletContext().getAttribute("repositoryManager");
- 		if (rm == null) {
- 			throw new Exception("WARNING: repositoryManager not found by getRecordUrl()");
- 		}
- 		return RepositoryService.getXMLDocReader(id, rm);
- 	}
- 
- 	/**
- 	 *  Gets the recordUrl from the index for this record using url path configured for the record's
- 	 framework. This call fails (returns null) if the url path is not configured
- 	 for the record's framework. 
- 	 *
- 	 * @param  id  record ID
- 	 * @return     the url value, or null if it cannot be obtained.
- 	 */
- 	private String getRecordUrl(String id, File file) {
- 		String url = null;
- 		try {
- 			if (file == null || !file.exists())
- 				throw new Exception ("file does not exist");
- 			
- 			XMLDocReader docReader = null;
- 			/* docReaders never found the first time a record is indexed. throwing
- 			   an exception here makes the log look like something's broken */
- 			try {
- 				docReader = getDocReader(id);
- 			} catch (Exception e) {}
- 			if (docReader == null) {
- 				return null;
- 			}
- 			
- 			String xmlFormat = docReader.getNativeFormat();
- 			MetaDataFramework framework = getMetaDataFramework (xmlFormat);
- 			if (framework == null)
- 				throw new Exception("MetadataFramework not found for " + xmlFormat);
- 			return framework.getRecordUrl(Dom4jUtils.getXmlDocument(file));
- 		} catch (Exception e) {
- 			prtln ("getRecordUrl: " + e);
- 		}
- 		return null;
- 	}
  
  	/**
--- 157,160 ----