Mercurial > hg > eSciDocImport

changeset 5:a42dabfcffdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fixes
author dwinter
date Sat, 15 Jan 2011 13:57:56 +0100
parents cb5668b07bfc
children 4b1ae52418c1
files .classpath .settings/org.eclipse.jdt.core.prefs src/de/mpiwg/itgroup/eSciDoc/config/echo.properties src/de/mpiwg/itgroup/eSciDoc/harvesting/ESciDocDataHarvester.java src/de/mpiwg/itgroup/eSciDoc/harvesting/FoxridgeHarvester.java
diffstat 5 files changed, 9 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/.classpath	Wed Jan 12 16:34:42 2011 +0100
+++ b/.classpath	Sat Jan 15 13:57:56 2011 +0100
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="lib" path="libs/jdom-1.0.jar"/>
 	<classpathentry kind="lib" path="libs/log4j-1.2.15.jar"/>
 	<classpathentry kind="lib" path="libs/jaxen-1.1.1.jar"/>
@@ -15,5 +14,6 @@
 	<classpathentry kind="lib" path="libs/httpcore-4.0.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/MetaDataManager"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/.settings/org.eclipse.jdt.core.prefs	Wed Jan 12 16:34:42 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#Thu Aug 12 09:32:38 CEST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
--- a/src/de/mpiwg/itgroup/eSciDoc/config/echo.properties	Wed Jan 12 16:34:42 2011 +0100
+++ b/src/de/mpiwg/itgroup/eSciDoc/config/echo.properties	Sat Jan 15 13:57:56 2011 +0100
@@ -1,3 +1,3 @@
 textServletUrl=http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/servlet/Texter?fn=
 dirInfoUrl=http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/dirInfo-xml.jsp?fn=
-metaDataManager=http://localhost:8180/MetaDataManagerRestlet
\ No newline at end of file
+metaDataManager=http://localhost:48080/MetaDataManagerRestlet
\ No newline at end of file
--- a/src/de/mpiwg/itgroup/eSciDoc/harvesting/ESciDocDataHarvester.java	Wed Jan 12 16:34:42 2011 +0100
+++ b/src/de/mpiwg/itgroup/eSciDoc/harvesting/ESciDocDataHarvester.java	Sat Jan 15 13:57:56 2011 +0100
@@ -166,6 +166,7 @@
 					String md5 = ((ECHORessource) obj).getIndexMetaMD5onServer();
 					List<eSciDocXmlObject> results = connector.getObjectsFromSearch("escidoc.component.checksum",md5);
 					if (results.size()>0){ //index.meta schon abgespeichert
+						notAddedFile.debug("alredy exist:"+obj.echoUrl);
 						continue;
 					}
 					
@@ -288,7 +289,7 @@
 			e.printStackTrace();
 		}
 		
-		
+		addedFile.debug("updated:"+objOld.eScidocId);
 	}
 
 	/**
@@ -396,7 +397,7 @@
 
 		hv.releaseAndSubmitObjects(
 				"/ir/context/escidoc:1001/resources/members",
-				"//escidocItem:item",1);
+				"//escidocItem:item",0);
 
 		// newimporter.organizeRessourcesInCollections(connector,
 		// "/ir/context/escidoc:1001");
--- a/src/de/mpiwg/itgroup/eSciDoc/harvesting/FoxridgeHarvester.java	Wed Jan 12 16:34:42 2011 +0100
+++ b/src/de/mpiwg/itgroup/eSciDoc/harvesting/FoxridgeHarvester.java	Sat Jan 15 13:57:56 2011 +0100
@@ -37,14 +37,15 @@
         //}
 		EScidocBasicHandler connector = new EScidocBasicHandler("escidoc-test.mpiwg-berlin.mpg.de",8080,"dwinter","weikiki7");
 		
-		ESciDocDataHarvester hv = new ESciDocDataHarvester(new FoxridgeImporter(new File("/Volumes/online_permanent/shipbuilding/")),
+		ESciDocDataHarvester hv = new ESciDocDataHarvester(new FoxridgeImporter(new File("/Volumes/online_permanent/")),
 				new ECHOTransformer(),connector,"/ir/context/escidoc:12001"); 
 		
 		//hv.readObjectsFromInstance("ECHO_collection");
-		hv.readObjectsFromInstance("ECHO_resource");
+		//hv.readObjectsFromInstance("ECHO_resource");
 		
 		//hv.releaseAndSubmitObjects("/ir/context/escidoc:12001");
-		//hv.releaseAndSubmitObjects("/ir/context/escidoc:12001/resources/members","//escidocItem:item",1);
+		hv.releaseAndSubmitObjects("/ir/context/escidoc:12001/resources/members","//escidocItem:item",1
+				);
 		
 
 	}