Mercurial > repos > siwaa > redelac_stics_e

diff redelacPlanExpander.py @ 6:40595ca55c78 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload for repository https://forgemia.inra.fr/redelac/redelac-toolbox/-/tree/fa822bd9c974bf5ffb4e632905dd65c2f097e325/tools/REDELACplanExpander commit fa822bd9c974bf5ffb4e632905dd65c2f097e325-dirty"
author siwaa
date Fri, 26 Jun 2026 13:15:23 +0000
parents 996b8019f5d5
children c8f0edcc1330
line wrap: on
line diff
--- a/redelacPlanExpander.py	Tue Feb 17 16:03:29 2026 +0000
+++ b/redelacPlanExpander.py	Fri Jun 26 13:15:23 2026 +0000
@@ -117,9 +117,11 @@
     if typeOfRotation == 'GC' :
         tmpDf['Norg_sols'] = row['Norg_sols_GC']
         tmpDf['nom_sol_sans_point'] = row['nom_sols_GC_dans_USM']
+        tmpDf['nomsol'] = row['nom_sols_GC_dans_sols.xml']
     else : 
         tmpDf['Norg_sols'] = row['Norg_sols_PP']
         tmpDf['nom_sol_sans_point'] = row['nom_sols_PP_dans_USM']
+        tmpDf['nomsol'] = row['nom_sols_PP_dans_sols.xml']
 
     tmpDf['maille_drias'] = drias
     tmpDf['maille_safran'] = safran
@@ -162,9 +164,9 @@
     # Updating the nomsol column
     # alias =CONCATENATE(G2;"_";H2)
 
-    tmpDf['nomsol'] = \
-        tmpDf['num_sol'].astype(str) + '_' + \
-        tmpDf['Norg_sols'].astype(str)
+    #tmpDf['nomsol'] = \
+    #    tmpDf['num_sol'].astype(str) + '_' + \
+    #    tmpDf['Norg_sols'].astype(str)
 
     if SafranOrDrias :    
         # Updating the fstation column