litesoft

URLs

Explore

Commits

Diff Revisions 474 vs 475 for /trunk/Java/core/Server/src/org/litesoft/orsup/DataLoader.java

		@@ -4,8 +4,7 @@
4	4		import java.io.*;
5	5		import java.util.*;
6	6
7		-	import org.litesoft.configuration.Configuration;
8		-	import org.litesoft.configuration.ServerConfiguration;
	7	+	import org.litesoft.configuration.*;
9	8		import org.litesoft.exceptions.*;
10	9		import org.litesoft.util.*;
11	10
		@@ -23,16 +22,16 @@
23	22
24	23		private String getSubDirPath( String pSubDir )
25	24		{
26		-	String parent = ServerConfiguration.getPath(PROPERTY_LOAD_DATA_DIR_PARENT_PATH, DEFAULT_LOAD_DATA_RELATIVE_DIR_PARENT_PATH);
	25	+	String parent = ServerConfiguration.getPath( PROPERTY_LOAD_DATA_DIR_PARENT_PATH, DEFAULT_LOAD_DATA_RELATIVE_DIR_PARENT_PATH );
27	26		return parent + "/" + pSubDir;
28	27		}
29	28
30	29		public void loadData()
31	30		{
32		-	String zLoadDataPath = ServerConfiguration.getPath(PROPERTY_LOAD_DATA_PATH, null);
	31	+	String zLoadDataPath = ServerConfiguration.getPath( PROPERTY_LOAD_DATA_PATH, null );
33	32		if ( zLoadDataPath == null )
34	33		{
35		-	zLoadDataPath = getSubDirPath(Configuration.getString(PROPERTY_LOAD_DATA_SUB_DIR,DEFAULT_LOAD_DATA_SUB_DIR_REGULAR));
	34	+	zLoadDataPath = getSubDirPath( Configuration.getString( PROPERTY_LOAD_DATA_SUB_DIR, DEFAULT_LOAD_DATA_SUB_DIR_REGULAR ) );
36	35		}
37	36		loadDataFrom( zLoadDataPath );
38	37		}
		@@ -69,7 +68,7 @@
69	68		{
70	69		try
71	70		{
72		-	File zLoadDir = new File( getSubDirPath(DEFAULT_LOAD_DATA_SUB_DIR_DEMO) );
	71	+	File zLoadDir = new File( getSubDirPath( DEFAULT_LOAD_DATA_SUB_DIR_DEMO ) );
73	72		String[] zFilesToLoad = getFileNames( zLoadDir );
74	73		return DB_Import.importCSVtoMemo( FileUtils.filesToReaders( zLoadDir, zFilesToLoad ) );
75	74		}
		@@ -83,7 +82,7 @@
83	82		{
84	83		try
85	84		{
86		-	File zLoadDir = new File( getSubDirPath(DEFAULT_LOAD_DATA_SUB_DIR_DEMO) );
	85	+	File zLoadDir = new File( getSubDirPath( DEFAULT_LOAD_DATA_SUB_DIR_DEMO ) );
87	86		DB_Import.importCSVfromMemo( zLoadDir, pCSVtoMemo );
88	87		}
89	88		catch ( IOException e )

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/core/Server/src/org/litesoft/orsup/DataLoader.java