inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-09-17 14:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed recursive initialization of OpenOfficeMetadataExtracter.

Browse Source 
Fixed minor incorrect warning when XMLMetadataExtracter is active.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6279 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-07-17 16:30:44 +00:00
parent eccc9be0be
commit 91c962aae5
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/content-services-context.xml
View File

@@ -153,7 +153,7 @@
<bean id="extracter.Html" class="org.alfresco.repo.content.metadata.HtmlMetadataExtracter" parent="baseMetadataExtracter" /> <bean id="extracter.Html" class="org.alfresco.repo.content.metadata.HtmlMetadataExtracter" parent="baseMetadataExtracter" />
<bean id="extracter.MP3" class="org.alfresco.repo.content.metadata.MP3MetadataExtracter" parent="baseMetadataExtracter" /> <bean id="extracter.MP3" class="org.alfresco.repo.content.metadata.MP3MetadataExtracter" parent="baseMetadataExtracter" />
<bean id="extracter.OpenDocument" class="org.alfresco.repo.content.metadata.OpenDocumentMetadataExtracter" parent="baseMetadataExtracter" /> <bean id="extracter.OpenDocument" class="org.alfresco.repo.content.metadata.OpenDocumentMetadataExtracter" parent="baseMetadataExtracter" />
<bean id="extracter.OpenOffice" class="org.alfresco.repo.content.metadata.OpenOfficeMetadataExtracter" parent="baseMetadataExtracter" init-method="init" > <bean id="extracter.OpenOffice" class="org.alfresco.repo.content.metadata.OpenOfficeMetadataExtracter" parent="baseMetadataExtracter" >
<property name="connection"> <property name="connection">
<ref bean="openOfficeConnection" /> <ref bean="openOfficeConnection" />
</property> </property>

4
source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
View File

@@ -474,8 +474,8 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
} }
} }
// Were there any mappings // The configured mappings are empty, but there were default mappings
if (mapping.size() == 0) if (mapping.size() == 0 && defaultMapping.size() > 0)
{ {
logger.warn( logger.warn(
"There are no property mappings for the metadata extracter.\n" + "There are no property mappings for the metadata extracter.\n" +

12
source/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataExtracter.java
View File

@@ -102,17 +102,21 @@ public class OpenOfficeMetadataExtracter extends AbstractMappingMetadataExtracte
/** /**
* Initialises the bean by establishing an UNO connection * Initialises the bean by establishing an UNO connection
*/ */
@Override
public synchronized void init() public synchronized void init()
{ {
PropertyCheck.mandatory("OpenOfficeMetadataExtracter", "connection", connection); PropertyCheck.mandatory("OpenOfficeMetadataExtracter", "connection", connection);
// Base initialization
super.init();
// attempt a connection // attempt a connection
connect(); connect();
if (isConnected()) // Only allow registration if the connection is good
if (!isConnected())
{ {
// Only register if the connection is available initially. Reconnections are only supported // Reconnections are only supported if the server is able to connection initially.
// if the server is able to connection initially. super.setRegistry(null);
super.register();
} }
} }