Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Simplify keep existing

Browse source
This commit is contained in:
Victor Shcherb 2012-01-03 09:59:32 +01:00
parent 6ee39a8887
commit 3d368693c3
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
DataExtractionOSM/src/net/osmand/data/index/IndexBatchCreator.java
View file

@ -115,15 +115,6 @@ public class IndexBatchCreator {
} }
} }
boolean skipExisting = false;
for (int i = 0; i < args.length; i++) {
if ("--skip-existing".equals(args[i])) {
skipExisting = true;
break;
}
}
try { try {
Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(stream); Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(stream);
Document regions = null; Document regions = null;
@ -131,7 +122,7 @@ public class IndexBatchCreator {
name = args[1]; name = args[1];
regions = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(regionsStream); regions = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(regionsStream);
} }
creator.runBatch(doc, regions, skipExisting); creator.runBatch(doc, regions);
} catch (Exception e) { } catch (Exception e) {
System.out.println("XML configuration file could not be read from " + name); System.out.println("XML configuration file could not be read from " + name);
e.printStackTrace(); e.printStackTrace();
@ -141,7 +132,7 @@ public class IndexBatchCreator {
} }
} }
public void runBatch(Document doc, Document regions, boolean skipExisting) throws SAXException, IOException, ParserConfigurationException{ public void runBatch(Document doc, Document regions) throws SAXException, IOException, ParserConfigurationException{
NodeList list = doc.getElementsByTagName("process"); NodeList list = doc.getElementsByTagName("process");
if(list.getLength() != 1){ if(list.getLength() != 1){
throw new IllegalArgumentException("You should specify exactly 1 process element!"); throw new IllegalArgumentException("You should specify exactly 1 process element!");
@ -149,7 +140,7 @@ public class IndexBatchCreator {
Element process = (Element) list.item(0); Element process = (Element) list.item(0);
IndexCreator.REMOVE_POI_DB = true; IndexCreator.REMOVE_POI_DB = true;
String file = process.getAttribute("skipExistingIndexesAt"); String file = process.getAttribute("skipExistingIndexesAt");
if(file != null && new File(file).exists() && skipExisting){ if (file != null && new File(file).exists()) {
skipExistingIndexes = new File(file); skipExistingIndexes = new File(file);
} }
wget = process.getAttribute("wget"); wget = process.getAttribute("wget");