Skip to content

Commit cfb9393

Browse files
computatecomputate
committed
Fixing bugs with SITE_SRC var
1 parent 926499d commit cfb9393

7 files changed

Lines changed: 97 additions & 85 deletions

File tree

‎src/main/java/org/computate/frFR/java/ConfigCles.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ public class ConfigCles {
135135
public static final String var_ModeleBase = "var_ModeleBase";
136136
public static final String var_Colonne = "var_Colonne";
137137
public static final String var_COMPUTATE_ENSEMBLE_RECHERCHE_PREFIXE = "var_COMPUTATE_ENSEMBLE_RECHERCHE_PREFIXE";
138+
public static final String var_COMPUTATE_VERTX_SRC = "var_COMPUTATE_VERTX_SRC";
138139
public static final String var_ConfigChemin = "var_ConfigChemin";
139140
public static final String var_ConfigCles = "var_ConfigCles";
140141
public static final String var_Config = "var_Config";
@@ -426,8 +427,7 @@ public class ConfigCles {
426427
public static final String var_SessionId = "var_SessionId";
427428
public static final String var_Signature = "var_Signature";
428429
public static final String var_siteChemin = "var_siteChemin";
429-
public static final String var_SITE_CHEMIN = "var_SITE_CHEMIN";
430-
public static final String var_SITE_CHEMIN_VERTX = "var_SITE_CHEMIN_VERTX";
430+
public static final String var_SITE_SRC = "var_SITE_SRC";
431431
public static final String var_siteContexte = "var_siteContexte";
432432
public static final String var_SiteContexte = "var_SiteContexte";
433433
public static final String var_siteCrypte = "var_siteCrypte";

‎src/main/java/org/computate/frFR/java/ConfigSite.java‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,6 @@ public static JsonObject getConfiguration(Jinjava jinjava, JsonObject classeLang
124124
String template = Files.readString(configFichier.toPath());
125125
HashMap<String, Object> ctx = new HashMap<>();
126126
configuration = new JsonObject();
127-
ctx.put(classeLangueConfig.getString("var_SITE_NOM"), System.getenv(classeLangueConfig.getString("var_SITE_NOM")));
128-
ctx.put(classeLangueConfig.getString("var_SITE_CHEMIN"), System.getenv(classeLangueConfig.getString("var_SITE_CHEMIN")));
129-
ctx.put("COMPUTATE_SRC", System.getenv("COMPUTATE_SRC"));
130127
Yaml yaml = new Yaml();
131128
Map<String, Object> map = yaml.load(template);
132129
for(String key : map.keySet()) {
@@ -215,6 +212,31 @@ protected void _langueConfigGlobale() throws Exception {
215212
langueConfigGlobale = getLangueConfigGlobale(jinjava, appComputate, langueNomGlobale);
216213
}
217214

215+
/**
216+
* Var.enUS: configPath enUS: The absolute path to the app config file.
217+
*/
218+
public String configChemin;
219+
220+
/**
221+
* Var.enUS: _configPath r: configChemin r.enUS: configPath r: siteChemin
222+
* r.enUS: sitePath r: siteNom r.enUS: siteName
223+
**/
224+
protected void _configChemin() throws Exception {
225+
configChemin = System.getenv(classeLangueConfig.getString("var_VARS_CHEMIN"));
226+
}
227+
228+
/**
229+
* The INI Configuration Object for the config file.
230+
*/
231+
public JsonObject config;
232+
233+
/**
234+
* r: fichierConfig r.enUS: configFile
235+
**/
236+
protected void _config() throws Exception {
237+
config = getConfiguration(jinjava, classeLangueConfig);
238+
}
239+
218240
/**
219241
* Var.enUS: siteName frFR: Le nom de l'lappli. enUS: The name of the
220242
* application.
@@ -226,7 +248,7 @@ protected void _langueConfigGlobale() throws Exception {
226248
**/
227249
protected void _siteNom() throws Exception {
228250
if (siteNom == null)
229-
siteNom = System.getenv(langueConfigGlobale.getString(ConfigCles.var_SITE_NOM));
251+
siteNom = config.getString(langueConfigGlobale.getString(ConfigCles.var_SITE_NOM));
230252
}
231253

232254
/**
@@ -240,7 +262,7 @@ protected void _siteNom() throws Exception {
240262
**/
241263
protected void _siteChemin() throws Exception {
242264
if (siteChemin == null)
243-
siteChemin = System.getenv(langueConfigGlobale.getString(ConfigCles.var_SITE_CHEMIN));
265+
siteChemin = config.getString(langueConfigGlobale.getString(ConfigCles.var_SITE_SRC));
244266
}
245267

246268
/**
@@ -254,7 +276,7 @@ protected void _siteChemin() throws Exception {
254276
**/
255277
protected void _siteCheminVertx() throws Exception {
256278
if (siteCheminVertx == null)
257-
siteCheminVertx = System.getenv(langueConfigGlobale.getString(ConfigCles.var_SITE_CHEMIN_VERTX));
279+
siteCheminVertx = config.getString(langueConfigGlobale.getString(ConfigCles.var_COMPUTATE_VERTX_SRC));
258280
}
259281

260282
/**
@@ -299,19 +321,6 @@ protected void _cheminSrcGenJava() throws Exception {
299321
cheminSrcGenJava = siteChemin + "/src/gen/java";
300322
}
301323

302-
/**
303-
* Var.enUS: configPath enUS: The absolute path to the app config file.
304-
*/
305-
public String configChemin;
306-
307-
/**
308-
* Var.enUS: _configPath r: configChemin r.enUS: configPath r: siteChemin
309-
* r.enUS: sitePath r: siteNom r.enUS: siteName
310-
**/
311-
protected void _configChemin() throws Exception {
312-
configChemin = System.getenv(classeLangueConfig.getString("var_VARS_CHEMIN"));
313-
}
314-
315324
/**
316325
* Var.enUS: configFile enUS: The File Object for the app config file.
317326
*/
@@ -406,18 +415,6 @@ protected void _jinjava() throws Exception {
406415
jinjava = getJinjava();
407416
}
408417

409-
/**
410-
* The INI Configuration Object for the config file.
411-
*/
412-
public JsonObject config;
413-
414-
/**
415-
* r: fichierConfig r.enUS: configFile
416-
**/
417-
protected void _config() throws Exception {
418-
config = getConfiguration(jinjava, classeLangueConfig);
419-
}
420-
421418
/**
422419
* Var.enUS: languageActualName enUS: The actual language of the code. enUS: If
423420
* the languageName is configured as "tout", then the languageActualName would
@@ -899,15 +896,15 @@ public void initConfigSite() throws Exception {
899896
_appComputate();
900897
_jinjava();
901898
_langueConfigGlobale();
899+
_configChemin();
900+
_config();
902901
_siteNom();
903902
_siteChemin();
904903
_siteCheminVertx();
905904
_cheminSrcMainJava();
906905
_cheminSrcMainResources();
907906
_cheminSrcGenJava();
908-
_configChemin();
909907
_fichierConfig();
910-
_config();
911908
_langueNomActuel();
912909
_autresLangues();
913910
_toutesLangues();

‎src/main/java/org/computate/frFR/java/IndexerClasse.java‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2360,10 +2360,14 @@ else if(!StringUtils.contains(classeNomCanoniqueSuper, ".") && StringUtils.isNot
23602360
String classeNomCanoniqueApiServiceImplLangue = indexerStockerSolr(langueNom, classeDoc, "classeNomCanoniqueApiServiceImpl", classeNomEnsembleLangue + "." + classeNomSimpleApiServiceImplLangue);
23612361
String classeNomCanoniqueGenApiServiceLangue = indexerStockerSolr(langueNom, classeDoc, "classeNomCanoniqueGenApiService", classeNomEnsembleLangue + "." + classeNomSimpleGenApiServiceLangue);
23622362

2363-
String classeCheminApiEnsembleInfoLangue = concat(cheminSrcGenJavaVertxLangue, "/", StringUtils.replace(classeNomCanoniqueApiEnsembleInfoLangue, ".", "/"), ".java");
2364-
String classeCheminGenApiServiceImplLangue = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomCanoniqueGenApiServiceImplLangue, ".", "/"), ".java");
2365-
String classeCheminApiServiceImplLangue = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomCanoniqueApiServiceImplLangue, ".", "/"), ".java");
2366-
String classeCheminGenApiServiceLangue = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomCanoniqueGenApiServiceLangue, ".", "/"), ".java");
2363+
// String classeCheminApiEnsembleInfoLangue = concat(cheminSrcGenJavaVertxLangue, "/", StringUtils.replace(classeNomCanoniqueApiEnsembleInfoLangue, ".", "/"), ".java");
2364+
// String classeCheminGenApiServiceImplLangue = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomCanoniqueGenApiServiceImplLangue, ".", "/"), ".java");
2365+
// String classeCheminApiServiceImplLangue = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomCanoniqueApiServiceImplLangue, ".", "/"), ".java");
2366+
// String classeCheminGenApiServiceLangue = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomCanoniqueGenApiServiceLangue, ".", "/"), ".java");
2367+
String classeCheminApiEnsembleInfoLangue = concat(cheminSrcGenJava, "/", StringUtils.replace(classeNomCanoniqueApiEnsembleInfoLangue, ".", "/"), ".java");
2368+
String classeCheminGenApiServiceImplLangue = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomCanoniqueGenApiServiceImplLangue, ".", "/"), ".java");
2369+
String classeCheminApiServiceImplLangue = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomCanoniqueApiServiceImplLangue, ".", "/"), ".java");
2370+
String classeCheminGenApiServiceLangue = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomCanoniqueGenApiServiceLangue, ".", "/"), ".java");
23672371

23682372
indexerStockerSolr(langueNom, classeDoc, "classeCheminApiEnsembleInfo", classeCheminApiEnsembleInfoLangue);
23692373
indexerStockerSolr(langueNom, classeDoc, "classeCheminGenApiServiceImpl", classeCheminGenApiServiceImplLangue);
@@ -5165,16 +5169,19 @@ else if(classeLangueConfig.getString(ConfigCles.var_PUTFusion).equals(classeApiM
51655169
String classeGenPageChemin;
51665170
if(StringUtils.contains(classePageNomSimpleMethode, "Page")) {
51675171
classeGenPageNomSimple = StringUtils.substringBeforeLast(classePageNomSimpleMethode, "Page") + "GenPage" + StringUtils.substringAfterLast(classePageNomSimpleMethode, "Page");
5168-
classeGenPageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5172+
// classeGenPageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5173+
classeGenPageChemin = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
51695174
}
51705175
else {
51715176
classeGenPageNomSimple = "Gen" + classePageNomSimpleMethode;
5172-
classeGenPageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5177+
// classeGenPageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5178+
classeGenPageChemin = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
51735179
}
51745180
indexerStockerSolr(langueNom, classeDoc, "classeGenPageNomSimple" + classeApiMethode, classeGenPageNomSimple);
51755181
String classeGenPageNomCanonique = classeNomEnsembleLangue + "." + classeGenPageNomSimple;
51765182
indexerStockerSolr(langueNom, classeDoc, "classeGenPageNomCanonique" + classeApiMethode, classeGenPageNomCanonique);
5177-
String classePageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classePageNomSimpleMethode, ".java");
5183+
// String classePageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classePageNomSimpleMethode, ".java");
5184+
String classePageChemin = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classePageNomSimpleMethode, ".java");
51785185
indexerStockerSolr(langueNom, classeDoc, "classeGenPageChemin" + classeApiMethode, classeGenPageChemin);
51795186
indexerStockerSolr(langueNom, classeDoc, "classePageChemin" + classeApiMethode, classePageChemin);
51805187
classePageLangueNom = langueNom;
@@ -5193,13 +5200,17 @@ else if(classeLangueConfig.getString(ConfigCles.var_PUTFusion).equals(classeApiM
51935200

51945201
if(StringUtils.contains(classePageNomSimpleMethode, "Page")) {
51955202
classeGenPageNomSimple = StringUtils.substringBeforeLast(classePageNomSimpleMethode, "Page") + "GenPage" + StringUtils.substringAfterLast(classePageNomSimpleMethode, "Page");
5196-
classeGenPageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5197-
classePageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classePageNomSimpleMethode, ".java");
5203+
// classeGenPageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5204+
classeGenPageChemin = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5205+
// classePageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classePageNomSimpleMethode, ".java");
5206+
classePageChemin = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classePageNomSimpleMethode, ".java");
51985207
}
51995208
else {
52005209
classeGenPageNomSimple = "Gen" + classePageNomSimpleMethode;
5201-
classeGenPageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5202-
classePageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classePageNomSimpleMethode, ".java");
5210+
// classeGenPageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5211+
classeGenPageChemin = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5212+
// classePageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classePageNomSimpleMethode, ".java");
5213+
classePageChemin = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classePageNomSimpleMethode, ".java");
52035214
}
52045215
indexerStockerSolr(langueNom, classeDoc, "classeGenPageNomSimple" + classeApiMethode, classeGenPageNomSimple);
52055216
indexerStockerSolr(langueNom, classeDoc, "classeGenPageChemin" + classeApiMethode, classeGenPageChemin);
@@ -5289,16 +5300,19 @@ else if(classeLangueConfig.getString(ConfigCles.var_PUTFusion).equals(classeApiM
52895300
String classeGenPageChemin;
52905301
if(StringUtils.contains(classePageNomSimple, "Page")) {
52915302
classeGenPageNomSimple = StringUtils.substringBeforeLast(classePageNomSimple, "Page") + "GenPage" + StringUtils.substringAfterLast(classePageNomSimple, "Page");
5292-
classeGenPageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5303+
// classeGenPageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5304+
classeGenPageChemin = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
52935305
}
52945306
else {
52955307
classeGenPageNomSimple = "Gen" + classePageNomSimple;
5296-
classeGenPageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5308+
// classeGenPageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
5309+
classeGenPageChemin = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classeGenPageNomSimple, ".java");
52975310
}
52985311
indexerStockerSolr(langueNomGlobale, classeDoc, "classeGenPageNomSimple", classeGenPageNomSimple);
52995312
String classeGenPageNomCanonique = classeNomEnsembleLangue + "." + classeGenPageNomSimple;
53005313
indexerStockerSolr(langueNomGlobale, classeDoc, "classeGenPageNomCanonique", classeGenPageNomCanonique);
5301-
String classePageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classePageNomSimple, ".java");
5314+
// String classePageChemin = concat(cheminSrcMainJavaVertxLangue, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classePageNomSimple, ".java");
5315+
String classePageChemin = concat(cheminSrcMainJava, "/", StringUtils.replace(classeNomEnsembleLangue, ".", "/"), "/", classePageNomSimple, ".java");
53025316
indexerStockerSolr(langueNomGlobale, classeDoc, "classeGenPageChemin", classeGenPageChemin);
53035317
indexerStockerSolr(langueNomGlobale, classeDoc, "classePageChemin", classePageChemin);
53045318
indexerStockerSolr(langueNomGlobale, classeDoc, "classePageCheminCss", concat(siteChemin, "-static/css/", langueNomGlobale, "/", classePageNomSimple, ".css"));

‎src/main/java/org/computate/frFR/java/RegarderClasseBase.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public String genererId(String s) {
6464
*/
6565
@Override protected void _siteChemin() throws Exception {
6666
if(siteChemin == null) {
67-
siteChemin = System.getenv(langueConfigGlobale.getString(ConfigCles.var_SITE_CHEMIN));
67+
siteChemin = config.getString(langueConfigGlobale.getString(ConfigCles.var_SITE_SRC));
6868
if(siteChemin == null)
6969
siteChemin = args[0];
7070
}
@@ -77,7 +77,7 @@ public String genererId(String s) {
7777
*/
7878
@Override protected void _siteCheminVertx() throws Exception {
7979
if(siteCheminVertx == null) {
80-
siteCheminVertx = System.getenv(langueConfigGlobale.getString(ConfigCles.var_SITE_CHEMIN_VERTX));
80+
siteCheminVertx = config.getString(langueConfigGlobale.getString(ConfigCles.var_COMPUTATE_VERTX_SRC));
8181
}
8282
}
8383

@@ -92,7 +92,7 @@ public String genererId(String s) {
9292
*/
9393
protected void _classeCheminAbsolu() throws Exception {
9494
if(classeCheminAbsolu == null) {
95-
classeCheminAbsolu = System.getenv(langueConfigGlobale.getString(ConfigCles.var_CLASSE_CHEMIN_ABSOLU));
95+
classeCheminAbsolu = config.getString(langueConfigGlobale.getString(ConfigCles.var_CLASSE_CHEMIN_ABSOLU));
9696
if(classeCheminAbsolu == null)
9797
classeCheminAbsolu = args[1];
9898
}
@@ -119,7 +119,7 @@ protected void _classeCheminAbsolu() throws Exception {
119119
*/
120120
protected void _siteChemins() throws Exception {
121121
for(String langueNom : toutesLangues) {
122-
String siteCheminLangue = config.getString(langueConfigGlobale.getString(ConfigCles.var_SITE_CHEMIN) + "_" + langueNom);
122+
String siteCheminLangue = config.getString(langueConfigGlobale.getString(ConfigCles.var_SITE_SRC) + "_" + langueNom);
123123
if(StringUtils.isEmpty(siteCheminLangue)) {
124124
siteChemins.put(langueNom, siteChemin);
125125
}
@@ -148,7 +148,7 @@ protected void _siteChemins() throws Exception {
148148
*/
149149
protected void _siteCheminsVertx() throws Exception {
150150
for(String langueNom : toutesLangues) {
151-
String siteCheminVertxLangue = config.getString(langueConfigGlobale.getString(ConfigCles.var_SITE_CHEMIN_VERTX) + "_" + langueNom);
151+
String siteCheminVertxLangue = config.getString(langueConfigGlobale.getString(ConfigCles.var_COMPUTATE_VERTX_SRC) + "_" + langueNom);
152152
if(StringUtils.isEmpty(siteCheminVertxLangue)) {
153153
siteCheminsVertx.put(langueNom, siteCheminVertx);
154154
}

0 commit comments

Comments
 (0)