litesoft

URLs

Explore

Commits

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

		@@ -4,6 +4,8 @@
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	9		import org.litesoft.exceptions.*;
8	10		import org.litesoft.util.*;
9	11
		@@ -11,17 +13,26 @@
11	13		{
12	14		public static final DataLoader INSTANCE = new DataLoader();
13	15
14		-	private static final String LOAD_DATA_PATH = System.getProperty( "LoadDataPath" );
15		-	private static final String LOAD_DATA_DIR_PARENT_PATH = System.getProperty( "LoadDataDirParentPath", "../webapps/LoadData" );
16		-	private static final String LOAD_DATA_SUB_DIR = System.getProperty( "LoadDataSubDir", "Default" );
17		-	private static final String LOAD_DEMO_DATA_PATH = LOAD_DATA_DIR_PARENT_PATH + "/Demo";
	16	+	public static final String DEFAULT_LOAD_DATA_RELATIVE_DIR_PARENT_PATH = "LoadData";
	17	+	public static final String DEFAULT_LOAD_DATA_SUB_DIR_REGULAR = "Default";
	18	+	public static final String DEFAULT_LOAD_DATA_SUB_DIR_DEMO = "Demo";
	19	+
	20	+	public static final String PROPERTY_LOAD_DATA_PATH = "LoadDataPath";
	21	+	public static final String PROPERTY_LOAD_DATA_DIR_PARENT_PATH = "LoadDataDirParentPath";
	22	+	public static final String PROPERTY_LOAD_DATA_SUB_DIR = "LoadDataSubDir";
	23	+
	24	+	private String getSubDirPath( String pSubDir )
	25	+	{
	26	+	String parent = ServerConfiguration.getPath(PROPERTY_LOAD_DATA_DIR_PARENT_PATH, DEFAULT_LOAD_DATA_RELATIVE_DIR_PARENT_PATH);
	27	+	return parent + "/" + pSubDir;
	28	+	}
18	29
19	30		public void loadData()
20	31		{
21		-	String zLoadDataPath = LOAD_DATA_PATH;
	32	+	String zLoadDataPath = ServerConfiguration.getPath(PROPERTY_LOAD_DATA_PATH, null);
22	33		if ( zLoadDataPath == null )
23	34		{
24		-	zLoadDataPath = LOAD_DATA_DIR_PARENT_PATH + "/" + LOAD_DATA_SUB_DIR;
	35	+	zLoadDataPath = getSubDirPath(Configuration.getString(PROPERTY_LOAD_DATA_SUB_DIR,DEFAULT_LOAD_DATA_SUB_DIR_REGULAR));
25	36		}
26	37		loadDataFrom( zLoadDataPath );
27	38		}
		@@ -42,7 +53,7 @@
42	53
43	54		public void loadDemoData()
44	55		{
45		-	synchronized ( LOAD_DEMO_DATA_PATH )
	56	+	synchronized ( getClass() )
46	57		{
47	58		if ( mCSVtoMemo == null )
48	59		{
		@@ -58,7 +69,7 @@
58	69		{
59	70		try
60	71		{
61		-	File zLoadDir = new File( LOAD_DEMO_DATA_PATH );
	72	+	File zLoadDir = new File( getSubDirPath(DEFAULT_LOAD_DATA_SUB_DIR_DEMO) );
62	73		String[] zFilesToLoad = getFileNames( zLoadDir );
63	74		return DB_Import.importCSVtoMemo( FileUtils.filesToReaders( zLoadDir, zFilesToLoad ) );
64	75		}
		@@ -72,7 +83,7 @@
72	83		{
73	84		try
74	85		{
75		-	File zLoadDir = new File( LOAD_DEMO_DATA_PATH );
	86	+	File zLoadDir = new File( getSubDirPath(DEFAULT_LOAD_DATA_SUB_DIR_DEMO) );
76	87		DB_Import.importCSVfromMemo( zLoadDir, pCSVtoMemo );
77	88		}
78	89		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