dflorey 2004/02/26 09:49:08
Modified: src/share/org/apache/slide/extractor Extractor.java
ExtractorTrigger.java
Added: src/share/org/apache/slide/extractor Extract.java
Log:
Extract added
Revision Changes Path
1.2 +4 -4
jakarta-slide/src/share/org/apache/slide/extractor/Extractor.java
Index: Extractor.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/extractor/Extractor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Extractor.java 25 Feb 2004 12:20:33 -0000 1.1
+++ Extractor.java 26 Feb 2004 17:49:08 -0000 1.2
@@ -37,5 +37,5 @@
* �Gets extracted property value from the resource, for example "author"
* �for a word doc, ...
*/
- public Map extract(InputStream content) throws ExtractorException;
+ public Extract extract(InputStream content) throws ExtractorException;
}
1.3 +6 -5
jakarta-slide/src/share/org/apache/slide/extractor/ExtractorTrigger.java
Index: ExtractorTrigger.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/extractor/ExtractorTrigger.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExtractorTrigger.java 25 Feb 2004 13:04:42 -0000 1.2
+++ ExtractorTrigger.java 26 Feb 2004 17:49:08 -0000 1.3
@@ -83,7 +83,8 @@
if ( content != null && descriptor != null ) {
Extractor[] extractor = getExtractors(descriptors, descriptor);
for ( int i = 0; i < extractor.length; i++ ) {
- Map extractedProperties = extractor[i].extract(new
ByteArrayInputStream(content.getContentBytes()));
+ Extract extract = extractor[i].extract(new
ByteArrayInputStream(content.getContentBytes()));
+ Map extractedProperties = extract.getProperties();
for ( Iterator j = extractedProperties.entrySet().iterator();
j.hasNext(); ) {
Map.Entry entry = (Map.Entry)j.next();
descriptor.setProperty((String)entry.getKey(),
entry.getValue());
1.1 jakarta-slide/src/share/org/apache/slide/extractor/Extract.java
Index: Extract.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/extractor/Extract.java,v 1.1
2004/02/26 17:49:08 dflorey Exp $
* $Revision: 1.1 $
* $Date: 2004/02/26 17:49:08 $
*
* ====================================================================
*
* Copyright 2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.slide.extractor;
import java.io.InputStream;
import java.util.Map;
import java.util.HashMap;
/**
* The Extract class
*
* @author <a href="mailto:[EMAIL PROTECTED]">Daniel Florey</a>
*/
public class Extract {
private InputStream content;
private Map properties;
public Extract() {
properties = new HashMap();
}
public Extract(InputStream content, Map properties) {
this.content = content;
this.properties = properties;
}
public InputStream getContent() {
return content;
}
public void setPropeperty(String key, String value) {
properties.put(key, value);
}
public Map getProperties() {
return properties;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
