Author: knguyen
Date: Fri Jun 15 16:53:31 2007
New Revision: 17602
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17602&repname=
=3Djahia
Log:
PEU-50: avoid using quartz jobs for file indexation.
Modified:
branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/hibernate/model/ind=
exingjob/JahiaContainerIndexingJob.java
branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/Ind=
exableDocument.java
branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/Ind=
exableDocumentImpl.java
branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/Jah=
iaSearchBaseService.java
branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/Jah=
iaSiteIndexingJob.java
branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/com=
pass/LuceneResourceForHighLighting.java
branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/luc=
ene/JahiaHitCollector.java
branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/val=
ves/ContainerSearchIndexProcessValveImpl.java
branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/val=
ves/FieldSearchIndexProcessValveImpl.java
branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/val=
ves/FileFieldIndexingThread.java
Modified: branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/hibernate/mod=
el/indexingjob/JahiaContainerIndexingJob.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-1-=
BRANCH/core/src/java/org/jahia/hibernate/model/indexingjob/JahiaContainerIn=
dexingJob.java&rev=3D17602&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/hibernate/model/ind=
exingjob/JahiaContainerIndexingJob.java (original)
+++ branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/hibernate/model/ind=
exingjob/JahiaContainerIndexingJob.java Fri Jun 15 16:53:31 2007
@@ -22,6 +22,7 @@
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.search.IndexableDocument;
import org.jahia.services.search.RemovableDocument;
+import org.jahia.services.search.JahiaFieldIndexableDocument;
import org.jahia.registries.ServicesRegistry;
=
import java.util.List;
@@ -107,6 +108,8 @@
.getIndexableDocumentsForContainer(this.getCtnId().intValu=
e(), user);
Iterator iterator =3D docs.iterator();
IndexableDocument doc =3D null;
+ HashMap fieldDocs =3D null;
+ HashMap removeFieldDocs =3D null;
while ( iterator.hasNext() ){
doc =3D (IndexableDocument)iterator.next();
if ( doc instanceof RemovableDocument ){
@@ -114,6 +117,25 @@
} else {
toAdd.add(doc);
}
+ fieldDocs =3D new HashMap();
+ removeFieldDocs =3D new HashMap();
+ List childDocs =3D doc.getChildIndexableDocuments();
+ Iterator childDocsIterator =3D childDocs.iterator();
+ IndexableDocument childDoc =3D null;
+ while ( childDocsIterator.hasNext() ){
+ childDoc =3D (IndexableDocument)childDocsIterator.next();
+ if ( childDoc instanceof RemovableDocument ){
+ if ( !removeFieldDocs.containsKey(childDoc.getKey()) ){
+ toRemove.add(childDoc);
+ removeFieldDocs.put(childDoc.getKey(),childDoc.get=
Key());
+ }
+ } else if ( childDoc instanceof JahiaFieldIndexableDocumen=
t){
+ if ( !fieldDocs.containsKey(childDoc.getKey()) ){
+ toAdd.add(childDoc);
+ fieldDocs.put(childDoc.getKey(),childDoc.getKey());
+ }
+ }
+ }
}
}
=
Modified: branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/sear=
ch/IndexableDocument.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-1-=
BRANCH/core/src/java/org/jahia/services/search/IndexableDocument.java&rev=
=3D17602&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/Ind=
exableDocument.java (original)
+++ branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/Ind=
exableDocument.java Fri Jun 15 16:53:31 2007
@@ -17,6 +17,7 @@
*/package org.jahia.services.search;
=
import java.util.Map;
+import java.util.List;
import java.io.Serializable;
=
/**
@@ -98,4 +99,6 @@
*/
public abstract void removeField (String name);
=
+ public abstract List getChildIndexableDocuments();
+ =
}
\ No newline at end of file
Modified: branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/sear=
ch/IndexableDocumentImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-1-=
BRANCH/core/src/java/org/jahia/services/search/IndexableDocumentImpl.java&r=
ev=3D17602&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/Ind=
exableDocumentImpl.java (original)
+++ branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/Ind=
exableDocumentImpl.java Fri Jun 15 16:53:31 2007
@@ -18,6 +18,8 @@
=
import java.util.Map;
import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
=
/**
*
@@ -30,6 +32,8 @@
=
private Map fields =3D new HashMap();
=
+ private List childIndexableDocuments =3D new ArrayList();
+
public IndexableDocumentImpl(){
=
}
@@ -164,4 +168,12 @@
}
}
=
+ public List getChildIndexableDocuments() {
+ return childIndexableDocuments;
+ }
+
+ public void setChildIndexableDocuments(List childIndexableDocuments) {
+ this.childIndexableDocuments =3D childIndexableDocuments;
+ }
+ =
}
\ No newline at end of file
Modified: branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/sear=
ch/JahiaSearchBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-1-=
BRANCH/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java&=
rev=3D17602&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/Jah=
iaSearchBaseService.java (original)
+++ branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/Jah=
iaSearchBaseService.java Fri Jun 15 16:53:31 2007
@@ -848,7 +848,7 @@
diff =3D job.getDate().longValue()-lastInsertTime.longValu=
e();
if (diff < this.indexingJobInsertMinInterval) {
// skip inserting the job
- //logger.info("Skip inserting indexingJob ");
+ // logger.info("Skip inserting indexingJob " + job.get=
ClassName() + "_" + job.getId());
return;
} else {
indexingJobInserts.put(keyAsString,job.getDate());
@@ -1197,9 +1197,34 @@
JahiaSite site =3D sitesService.getSite(contentContainer.g=
etSiteID());
List docs =3D getIndexableDocumentsForContainer(ctnId,user=
);
Iterator iterator =3D docs.iterator();
+ List childDocs =3D null;
+ Iterator childDocsIterator =3D null;
+ Map fieldDocs =3D null;
+ Map removeFieldDocs =3D null;
while ( iterator.hasNext() ){
+ fieldDocs =3D new HashMap();
+ removeFieldDocs =3D new HashMap();
+ IndexableDocument doc =3D (IndexableDocument)iterator.=
next();
this.getSearchHandler(site.getID())
- .addDocument((IndexableDocument)iterator.next(=
));
+ .addDocument(doc);
+ childDocs =3D doc.getChildIndexableDocuments();
+ childDocsIterator =3D childDocs.iterator();
+ IndexableDocument childDoc =3D null;
+ while ( childDocsIterator.hasNext() ){
+ childDoc =3D (IndexableDocument)childDocsIterator.=
next();
+ if ( childDoc instanceof RemovableDocument ){
+ if ( !removeFieldDocs.containsKey(childDoc.get=
Key()) ){
+ this.getSearchHandler(site.getID())
+ .addDocument(childDoc);
+ removeFieldDocs.put(childDoc.getKey(),chil=
dDoc.getKey());
+ }
+ } else if ( childDoc instanceof JahiaFieldIndexabl=
eDocument ){
+ if ( !fieldDocs.containsKey(childDoc.getKey())=
){
+ this.getSearchHandler(site.getID()).addDoc=
ument(childDoc);
+ fieldDocs.put(childDoc.getKey(),childDoc.g=
etKey());
+ }
+ }
+ }
}
} else {
this.addIndexingJob(indJob);
Modified: branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/sear=
ch/JahiaSiteIndexingJob.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-1-=
BRANCH/core/src/java/org/jahia/services/search/JahiaSiteIndexingJob.java&re=
v=3D17602&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/Jah=
iaSiteIndexingJob.java (original)
+++ branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/Jah=
iaSiteIndexingJob.java Fri Jun 15 16:53:31 2007
@@ -188,6 +188,8 @@
}
ctnListIds =3D containerService.getContainerListIDsInPage(=
contentPage,loadRequest);
ctnListEnum =3D ctnListIds.elements();
+ Map fieldDocs =3D null;
+ Map removeFieldDocs =3D null;
while ( ctnListEnum.hasMoreElements() ){
listId =3D (Integer)ctnListEnum.nextElement();
ctnIds =3D containerService.getctnidsInList(listId.int=
Value(), loadRequest);
@@ -209,6 +211,25 @@
} else {
toAdd.add(doc);
}
+ fieldDocs =3D new HashMap();
+ removeFieldDocs =3D new HashMap();
+ List childDocs =3D doc.getChildIndexableDocume=
nts();
+ Iterator childDocsIterator =3D childDocs.itera=
tor();
+ IndexableDocument childDoc =3D null;
+ while ( childDocsIterator.hasNext() ){
+ childDoc =3D (IndexableDocument)childDocsI=
terator.next();
+ if ( childDoc instanceof RemovableDocument=
){
+ if ( !removeFieldDocs.containsKey(chil=
dDoc.getKey()) ){
+ toRemove.add(childDoc);
+ removeFieldDocs.put(childDoc.getKe=
y(),childDoc.getKey());
+ }
+ } else if ( childDoc instanceof JahiaField=
IndexableDocument){
+ if ( !fieldDocs.containsKey(childDoc.g=
etKey()) ){
+ toAdd.add(childDoc);
+ fieldDocs.put(childDoc.getKey(),ch=
ildDoc.getKey());
+ }
+ }
+ }
}
if ( toAdd.size() > batchSize ){
synchronized (lock){
Modified: branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/sear=
ch/compass/LuceneResourceForHighLighting.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-1-=
BRANCH/core/src/java/org/jahia/services/search/compass/LuceneResourceForHig=
hLighting.java&rev=3D17602&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/com=
pass/LuceneResourceForHighLighting.java (original)
+++ branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/com=
pass/LuceneResourceForHighLighting.java Fri Jun 15 16:53:31 2007
@@ -167,7 +167,7 @@
ExtractedDocument extDoc =3D ServicesRegistry
.getInstance().getFileExtractionService()
.getAlreadyExtractedDocument(
- contentType,file.getPath());
+ contentType,site.getSiteKey() + "_" + =
file.getPath());
if ( extDoc !=3D null ){
Field f =3D Field.Text(JahiaSearchConstant.FILE_CO=
NTENT_FULLTEXT_SEARCH_FIELD,
extDoc.getContentAsString());
Modified: branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/JahiaHitCollector.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-1-=
BRANCH/core/src/java/org/jahia/services/search/lucene/JahiaHitCollector.jav=
a&rev=3D17602&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/luc=
ene/JahiaHitCollector.java (original)
+++ branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/luc=
ene/JahiaHitCollector.java Fri Jun 15 16:53:31 2007
@@ -359,6 +359,8 @@
this.scores.clear();
this.docs.clear();
this.maxScore =3D 0f;
+ this.maxHitsCount =3D 0;
+ this.luceneDocsCount =3D 0;
+ this.limitReached =3D false;
}
-
}
Modified: branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/sear=
ch/valves/ContainerSearchIndexProcessValveImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-1-=
BRANCH/core/src/java/org/jahia/services/search/valves/ContainerSearchIndexP=
rocessValveImpl.java&rev=3D17602&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/val=
ves/ContainerSearchIndexProcessValveImpl.java (original)
+++ branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/val=
ves/ContainerSearchIndexProcessValveImpl.java Fri Jun 15 16:53:31 2007
@@ -30,6 +30,7 @@
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.webdav.DAVFileAccess;
import org.jahia.services.webdav.JahiaWebdavBaseService;
+import org.jahia.services.fileextraction.FileExtractor;
import org.jahia.utils.LanguageCodeConverters;
import org.jahia.registries.ServicesRegistry;
import org.jahia.params.ProcessingContext;
@@ -38,10 +39,7 @@
import org.quartz.JobDataMap;
import org.quartz.SimpleTrigger;
=
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Map;
+import java.util.*;
=
/**
* <p>Title: </p>
@@ -166,6 +164,16 @@
DAVFileAccess file =3D JahiaWebdavBaseService.getInsta=
nce ()
.getDAVFileAccess (site, fField.getRealName ()=
);
if (file.isValid () && file.hasRevisions () && !file.i=
sCollection ()) {
+ List docs =3D ServicesRegistry.getInstance().getJa=
hiaSearchService()
+ .getIndexableDocumentsForField(field.getID=
(),context.getUser());
+ if ( docs !=3D null && !docs.isEmpty() ){
+ doc.getChildIndexableDocuments().addAll(docs);
+ }
+ /*
+ ServicesRegistry.getInstance().getJahiaSearchServi=
ce()
+ .indexField(field.getID(), context.getUser(), fals=
e, true);
+ */
+ /*
String contentType =3D fField.getType ();
if ("application/pdf".equalsIgnoreCase(contentType=
)) {
long lastModifiedDate =3D System.currentTimeMi=
llis();
@@ -176,7 +184,7 @@
}
boolean newExtractionRequired =3D ServicesRegi=
stry.getInstance()
.getFileExtractionService().newExtractionR=
equired(
- contentType, file.getPath(),lastModifi=
edDate);
+ contentType, site.getSiteKey() + "_" +=
file.getPath(),lastModifiedDate);
if ( newExtractionRequired ){
JobDetail jobDetail =3D new JobDetail("Ext=
racting File Field" + fField.getID(),
Scheduler.DEFAULT_GROUP, FileField=
IndexingThread.class );
@@ -194,7 +202,7 @@
} else {
ServicesRegistry.getInstance().getJahiaSearchS=
ervice()
.indexField(field.getID(), context.getUser=
(), false, true);
- }
+ }*/
}
} else {
valuesList.addAll(Arrays.asList(values));
Modified: branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/sear=
ch/valves/FieldSearchIndexProcessValveImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-1-=
BRANCH/core/src/java/org/jahia/services/search/valves/FieldSearchIndexProce=
ssValveImpl.java&rev=3D17602&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/val=
ves/FieldSearchIndexProcessValveImpl.java (original)
+++ branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/val=
ves/FieldSearchIndexProcessValveImpl.java Fri Jun 15 16:53:31 2007
@@ -186,7 +186,25 @@
ExtractedDocument extDoc =3D ServicesRegistry
.getInstance().getFileExtractionServic=
e()
.getAlreadyExtractedDocument(
- contentType,file.getPath());
+ contentType,site.getSiteKey() =
+ "_" + file.getPath());
+ if ( extDoc =3D=3D null ){
+ try {
+ long lastModifiedDate =3D System.curre=
ntTimeMillis();
+ try {
+ lastModifiedDate =3D file.getJahia=
FileField()
+ .getLastModifDate();
+ } catch (Throwable t) {
+ logger.debug(t);
+ }
+ InputStream ins =3D file.downloadFile(=
);
+ extDoc =3D ServicesRegistry.getInstanc=
e().getFileExtractionService()
+ .getExtractedDocument(contentT=
ype, site.getSiteKey() + "_" + file.getPath(), lastModifiedDate,
+ true, ins);
+ ins.close();
+ } catch (Throwable t) {
+ logger.info(t);
+ }
+ }
if ( extDoc !=3D null ){
strVal =3D extDoc.getContentAsString();
doc.addFieldValue(JahiaSearchConstant.FILE=
_CONTENT_FULLTEXT_SEARCH_FIELD,strVal);
@@ -207,6 +225,7 @@
}
}
}
+ /*
long lastModifiedDate =3D System.currentTimeMi=
llis();
try {
lastModifiedDate =3D file.getJahiaFileFiel=
d()
@@ -227,7 +246,7 @@
SimpleTrigger trigger =3D new SimpleTrigge=
r(jobDetail.getName(), Scheduler.DEFAULT_GROUP);
ServicesRegistry.getInstance().getSchedule=
rService().deleteRamJob(jobDetail.getName(), Scheduler.DEFAULT_GROUP);
ServicesRegistry.getInstance().getSchedule=
rService().scheduleRamJob(jobDetail, trigger);
- }
+ }*/
} catch ( Throwable t ){
logger.debug(t);
}
Modified: branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/sear=
ch/valves/FileFieldIndexingThread.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-1-=
BRANCH/core/src/java/org/jahia/services/search/valves/FileFieldIndexingThre=
ad.java&rev=3D17602&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/val=
ves/FileFieldIndexingThread.java (original)
+++ branches/JAHIA-5-0-1-BRANCH/core/src/java/org/jahia/services/search/val=
ves/FileFieldIndexingThread.java Fri Jun 15 16:53:31 2007
@@ -23,6 +23,7 @@
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.webdav.DAVFileAccess;
import org.jahia.services.webdav.JahiaWebdavBaseService;
+import org.jahia.services.fileextraction.ExtractedDocument;
import org.quartz.Job;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
@@ -71,25 +72,25 @@
logger.debug(t);
}
InputStream ins =3D file.downloadFile();
- ServicesRegistry.getInstance().getFileExtracti=
onService()
- .getExtractedDocument(contentType, fil=
e.getPath(), lastModifiedDate,
+ ExtractedDocument extDoc =3D ServicesRegistry.=
getInstance().getFileExtractionService()
+ .getExtractedDocument(contentType, sit=
e.getSiteKey() + "_" + file.getPath(), lastModifiedDate,
true, ins);
ins.close();
- if ( ServicesRegistry.getInstance().getFileExt=
ractionService()
- .getAlreadyExtractedDocument(contentTy=
pe,file.getPath()) !=3D null ){
+ if ( extDoc !=3D null ){
ServicesRegistry.getInstance().getJahiaSea=
rchService()
.indexField(field.getID(), context.get=
User(), false, true);
}
} catch (Throwable t) {
- logger.debug(t);
+ logger.info(t);
}
}
}
}
- org.jahia.services.database.ConnectionDispenser.terminateConne=
ction(); =
} catch (Throwable t) {
org.jahia.services.database.ConnectionDispenser.abortConnectio=
n(); =
- logger.debug("Exception occured extracting file", t);
+ logger.info("Exception occured extracting file", t);
+ } finally {
+ org.jahia.services.database.ConnectionDispenser.terminateConne=
ction();
}
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
