remove NOT NEEDED reference to solr.YaCySchema from ConfigurationSet to be able to use ConfigurationSet for other conf files (than solr.keys.default.list).

pull/1/head
reger 12 years ago
parent a3cd3852ab
commit e2d499be9e

@ -33,7 +33,6 @@ import java.util.TreeMap;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import net.yacy.cora.federate.solr.YaCySchema;
import net.yacy.cora.federate.yacy.ConfigurationSet.Entry; import net.yacy.cora.federate.yacy.ConfigurationSet.Entry;
import net.yacy.cora.storage.Files; import net.yacy.cora.storage.Files;
@ -162,14 +161,9 @@ public class ConfigurationSet extends TreeMap<String,Entry> implements Serializa
try { try {
if (modified) { if (modified) {
commit(); commit();
try {
YaCySchema f = YaCySchema.valueOf(key);
f.setSolrFieldName(entry.getValue());
} catch (IllegalArgumentException e) {}
} }
} catch (final IOException e) { } catch (final IOException e) {}
}
return modified; return modified;
} }
@ -201,8 +195,11 @@ public class ConfigurationSet extends TreeMap<String,Entry> implements Serializa
if (this.file == null) return; if (this.file == null) return;
// create a temporary bak file, use it as template to preserve user comments // create a temporary bak file, use it as template to preserve user comments
File bakfile = new File (this.file.getAbsolutePath() + ".bak"); File bakfile = new File (this.file.getAbsolutePath() + ".bak");
Files.copy (this.file, bakfile); try {
Files.copy(this.file, bakfile);
} catch (final IOException e) {
this.file.createNewFile();
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
TreeMap<String,Entry> tclone = (TreeMap<String,Entry>) this.clone(); // clone to write appended entries TreeMap<String,Entry> tclone = (TreeMap<String,Entry>) this.clone(); // clone to write appended entries
@ -240,7 +237,7 @@ public class ConfigurationSet extends TreeMap<String,Entry> implements Serializa
if (e != null) { if (e != null) {
writer.write (e.toString()); writer.write (e.toString());
tclone.remove(key); // remove written entries from clone tclone.remove(key); // remove written entries from clone
} else {writer.write(sorig); } }
writer.write("\n"); writer.write("\n");
} else { } else {
writer.write(sorig+"\n"); writer.write(sorig+"\n");

Loading…
Cancel
Save