You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2004/04/22 19:02:30 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/lucene/index IndexInformation.java
michi 2004/04/22 10:02:30
Modified: src/java/org/apache/lenya/lucene/index IndexInformation.java
Log:
unncessary list removed
Revision Changes Path
1.12 +20 -7 cocoon-lenya/src/java/org/apache/lenya/lucene/index/IndexInformation.java
Index: IndexInformation.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/lucene/index/IndexInformation.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- IndexInformation.java 14 Apr 2004 13:06:41 -0000 1.11
+++ IndexInformation.java 22 Apr 2004 17:02:30 -0000 1.12
@@ -53,7 +53,8 @@
collectFiles(dumpDirectory, filter, index);
this.startTime = new GregorianCalendar();
- log.info(getFileNumber() + " files to index");
+ log.info(length + " files to index");
+ //log.info(getFileNumber() + " files to index");
}
private String index;
@@ -68,10 +69,15 @@
return creating;
}
- private List files = new ArrayList();
+ //private List files = new ArrayList();
+ private int length = 0;
+ /**
+ *
+ */
protected void addFile(File file) {
- files.add(file);
+ //files.add(file);
+ length++;
}
/**
@@ -79,11 +85,13 @@
*
* @return DOCUMENT ME!
*/
+/*
public File[] getFiles() {
Collections.sort(files);
return (File[]) files.toArray(new File[files.size()]);
}
+*/
private int currentFile = 0;
@@ -108,9 +116,11 @@
*
* @return number of files to index
*/
+/*
public int getFileNumber() {
return files.size();
}
+*/
private Calendar startTime;
@@ -129,10 +139,12 @@
* @return indexing progress
*/
public String printProgress() {
- double percent = (double) currentFile / (double) getFileNumber();
+ double percent = (double) currentFile / (double) length;
+ //double percent = (double) currentFile / (double) getFileNumber();
DateFormat format = new SimpleDateFormat("HH:mm:ss");
- return "added document " + getCurrentFile() + " of " + getFileNumber() + " (" +
+ //return "added document " + getCurrentFile() + " of " + getFileNumber() + " (" +
+ return "added document " + getCurrentFile() + " of " + length + " (" +
(int) (percent * 100) + "%" + ", remaining time: " +
format.format(getEstimatedTime().getTime()) + ")";
}
@@ -144,7 +156,8 @@
long elapsedMillis = new Date().getTime() - getStartTime().getTime().getTime();
double millisPerFile = (double) elapsedMillis / (double) currentFile;
- long estimatedMillis = (long) (millisPerFile * getFileNumber()) - elapsedMillis;
+ long estimatedMillis = (long) (millisPerFile * length) - elapsedMillis;
+ //long estimatedMillis = (long) (millisPerFile * getFileNumber()) - elapsedMillis;
GregorianCalendar estimatedCalendar = new GregorianCalendar();
estimatedCalendar.setTimeInMillis(estimatedMillis);
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org