Skip to content

Commit 4552006

Browse files
committed
add appHome
1 parent 7510539 commit 4552006

1 file changed

Lines changed: 18 additions & 3 deletions

File tree

src/main/java/com/scudata/dm/query/SimpleSelect.java

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import com.scudata.dm.DataStruct;
2929
import com.scudata.dm.Env;
3030
import com.scudata.dm.FileObject;
31+
import com.scudata.dm.JobSpace;
3132
import com.scudata.dm.Param;
3233
import com.scudata.dm.Record;
3334
import com.scudata.dm.Sequence;
@@ -2993,6 +2994,16 @@ public SimpleSelect(ICellSet ics, Context ctx)
29932994
init();
29942995
}
29952996

2997+
public static File getAppHome(Context ctx) {
2998+
if (ctx != null) {
2999+
JobSpace js = ctx.getJobSpace();
3000+
if (js != null) return js.getAppHome();
3001+
}
3002+
3003+
return null;
3004+
}
3005+
3006+
29963007
private void init()
29973008
{
29983009
this.hasDistinct = false;
@@ -3702,13 +3713,17 @@ else if(this.tmd != null)
37023713
}
37033714

37043715
boolean fileExists = false;
3716+
File f = new File("");
3717+
37053718
//System.out.println("tableName " + tableName);
3706-
File[] fs = FileUtil.getFiles(tableName);
3719+
File appHome = getAppHome(ctx);
3720+
//.getAbsolutePath();
3721+
File[] fs = FileUtil.getFiles((appHome != null?appHome.getAbsolutePath()+"/":"")+tableName);
37073722
if (fs == null) {
3708-
fs = FileUtil.getFiles(Env.getMainPath()+"/"+tableName);
3723+
fs = FileUtil.getFiles((appHome != null?appHome.getAbsolutePath()+"/":"")+Env.getMainPath()+"/"+tableName);
37093724
if (fs == null && Env.getPaths() != null) {
37103725
for (int i=0; i<Env.getPaths().length; i++) {
3711-
fs = FileUtil.getFiles(Env.getPaths()[i]+"/"+tableName);
3726+
fs = FileUtil.getFiles((appHome != null?appHome.getAbsolutePath()+"/":"")+Env.getPaths()[i]+"/"+tableName);
37123727
if (fs != null) break;
37133728
}
37143729
}

0 commit comments

Comments
 (0)