luccioman 8 years ago
commit 21ab41d8d6

@ -82,7 +82,6 @@ This is a list of searches that had been requested from remote peer search inter
#File: Settings_UrlProxyAccess.inc
#---------------------------
Augmented Browsing<==Angereichertes Browsen<
URL Proxy Settings<==URL Proxy Einstellungen<
With this settings you can activate or deactivate URL proxy.==Mit diesen Einstellungen können Sie den URL Proxy an- oder abschalten.
Service call: ==Serviceaufruf:
@ -97,9 +96,7 @@ Define client filter. Default: ==Definiere den Client Filter. Standardeinstellun
URL substitution:==Ersetzen von URLs:
Define URL substitution rules which allow navigating in proxy environment. Possible values: all, domainlist. Default: domainlist.==Definiere die Regeln zum Ersetzen von URLs die Navigation in der Proxy Umgebung erlauben. Mögliche Werte: all, domainlist. Standardeinstellung: domainlist.
"Submit"=="Absenden"
Augmented Browsing Settings==Angereicherte Browser Einstellungen
#>Enabled<==>Aktiviert<
Enables or disables augmented browsing. If enabled, all websites will be modified during loading.==Schaltet angereichertes Browsing an oder ab. Wenn aktiviert werden alle Webseite während des Ladens modifiziert.
#-----------------------------
#File: Autocrawl_p.html
@ -881,7 +878,6 @@ http://url-of-the-search-result.net==http://URL-des-Suchergebnisses.de
#>Citation<==>Citation<
>Pictures<==>Bilder<
#>Cache<==>Cache<
>Augmented Browsing<==>Angereichertes Browsen<
"Save Settings"=="Einstellungen Speichern"
"Set Default Values"=="Setze Standardwerte"
#-----------------------------
@ -4042,10 +4038,6 @@ Content Semantic==Inhalt Semantik
>Automated Annotation<==>Automatische Annotation<
Auto-Annotation Vocabulary Editor==Auto-Annotation Vokabellisten Editor
Knowledge Loader==Wissensdatenbank-Lader
# Submenu Augmented Content
>Augmented Content<==>Angereicherter Inhalt<
Augmented Browsing==Angereichertes Browsing
Filters and Modules==Filter und Module
#-----------------------------
#File: env/templates/submenuTargetAnalysis.template

@ -133,9 +133,6 @@
<file original="Settings_UrlProxyAccess.inc" source-language="en" datatype="html">
<body>
<trans-unit id="1b8e9ae5" xml:space="preserve" approved="no" translate="yes">
<source>Augmented Browsing&lt;</source>
</trans-unit>
<trans-unit id="cfee6436" xml:space="preserve" approved="no" translate="yes">
<source>URL Proxy Settings&lt;</source>
</trans-unit>
@ -2123,9 +2120,6 @@
<trans-unit id="479c86d8" xml:space="preserve" approved="no" translate="yes">
<source>&gt;Cache&lt;</source>
</trans-unit>
<trans-unit id="34c085e7" xml:space="preserve" approved="no" translate="yes">
<source>&gt;Augmented Browsing&lt;</source>
</trans-unit>
<trans-unit id="37b12af6" xml:space="preserve" approved="no" translate="yes">
<source>For this option URL proxy must be enabled.</source>
</trans-unit>
@ -10485,12 +10479,6 @@
<trans-unit id="b2137635" xml:space="preserve" approved="no" translate="yes">
<source>Knowledge Loader</source>
</trans-unit>
<trans-unit id="44dbab11" xml:space="preserve" approved="no" translate="yes">
<source>&gt;Augmented Content&lt;</source>
</trans-unit>
<trans-unit id="ae4eec37" xml:space="preserve" approved="no" translate="yes">
<source>Augmented Browsing</source>
</trans-unit>
</body>
</file>

@ -150,6 +150,38 @@ public class CollectionConfiguration extends SchemaConfiguration implements Seri
ConcurrentLog.warn("SolrCollectionWriter", " solr schema file " + configurationFile.getAbsolutePath() + " is missing declaration for '" + field.name() + "'");
}
}
checkFieldRelationConsistency();
}
/**
* Check and update schema configuration with required related fields.
* If a specific field is enabled, there might be a other field internal
* processes rely on. Enable these required fields.
* For example, the outboundlinks are split into protocol and url part. The
* correct original url can only be assembled if both fields are available (protocol + url = originalUrl)
*/
private void checkFieldRelationConsistency() {
Entry e;
// for correct assembly of outboundlinks outboundlinks_protocol_sxt + outboundlinks_urlstub_sxt is needed
if (this.contains(CollectionSchema.outboundlinks_urlstub_sxt) && !this.contains(CollectionSchema.outboundlinks_protocol_sxt)) {
e = new Entry(CollectionSchema.outboundlinks_protocol_sxt.name(), CollectionSchema.outboundlinks_protocol_sxt.getSolrFieldName(), true);
this.put(CollectionSchema.outboundlinks_protocol_sxt.name(), e);
}
// for correct assembly of inboundlinks inboundlinks_protocol_sxt + inboundlinks_urlstub_sxt is needed
if (this.contains(CollectionSchema.inboundlinks_urlstub_sxt) && !this.contains(CollectionSchema.inboundlinks_protocol_sxt)) {
e = new Entry(CollectionSchema.inboundlinks_protocol_sxt.name(), CollectionSchema.inboundlinks_protocol_sxt.getSolrFieldName(), true);
this.put(CollectionSchema.inboundlinks_protocol_sxt.name(), e);
}
// for correct assembly of icon url icons_protocol_sxt + icons_urlstub_sxt is needed
if (this.contains(CollectionSchema.icons_urlstub_sxt) && !this.contains(CollectionSchema.icons_protocol_sxt)) {
e = new Entry(CollectionSchema.icons_protocol_sxt.name(), CollectionSchema.icons_protocol_sxt.getSolrFieldName(), true);
this.put(CollectionSchema.icons_protocol_sxt.name(), e);
}
// for correct assembly of image url images_protocol_sxt + images_urlstub_sxt is needed
if (this.contains(CollectionSchema.images_urlstub_sxt) && !this.contains(CollectionSchema.images_protocol_sxt)) {
e = new Entry(CollectionSchema.images_protocol_sxt.name(), CollectionSchema.images_protocol_sxt.getSolrFieldName(), true);
this.put(CollectionSchema.images_protocol_sxt.name(), e);
}
}
public String[] allFields() {
@ -183,6 +215,7 @@ public class CollectionConfiguration extends SchemaConfiguration implements Seri
*/
@Override
public void commit() throws IOException {
checkFieldRelationConsistency(); // in case of changes, check related fields are enabled before save
try {
super.commit();
// make sure the enum SolrField.SolrFieldName is current

Loading…
Cancel
Save