Bugfixes en create_datas scripts and admin.py

plugins/webui/interface/controllers/admin.py

@@ -142,11 +142,14 @@ def admin_create(request):
 
         for in_put, in_value in request.form.items():
             # The classname is handled by the datasource, we are not allowed to modify it
-            # uid is not a fieldname
             # both are hidden in the form, to identify the object here
-            if in_put != 'classname' and in_value != '':
+             if in_put != 'classname' and in_value != '':
                 fields[in_put[12:]] = in_value
-        
+                dhl = target_leo.data_handler(in_put[12:])
+                if dhl.is_reference() and in_value != '':
+                    in_value.replace(" ","")
+                    in_value=in_value.split(',')
+                    in_value=list(in_value)
         # Insertion in the database of the values corresponding to a new object
         new_uid = target_leo.insert(fields)
         

progs/create_datas

@@ -3,10 +3,12 @@
 host=$1
 instance=$2
 N=$3
-HOSTDB=localhost:27017
+HOSTDB=localhost
 
-for i in ${1..$N..10)
+M=$(expr $N / 10)
+for i in `eval echo {1..$M}`;
 do
+    COLPUBLI=""
     COLT=$(lenmax=100;wcount=5; rlenmax=$(expr $lenmax - 1); echo $(shuf /usr/share/dict/words | head -n $wcount | tr -s "\n" " ") | sed -E "s/^(.{$rlenmax}).*$/\1/") 
     curl -A "Mozilla/5.0" -L -s -d "field_input_title=$COLT&field_input_publications=$COLPUBLI&classname=Collection" http://$host/$instance/admin/create?classname=Collection
     ITTHM="themetest"
@@ -21,65 +23,67 @@ do
     curl -A "Mozilla/5.0" -L -s -d "field_input_lastname=$LN&field_input_firstname=$FN&field_input_password=$PWD&field_input_login=$LOGIN&classname=User" http://$host/$instance/admin/create?classname=User
 done
 
-for i in ${1..$N..4)
+M=$(expr $N / 4)
+for i in `eval echo {1..$M}`;
 do
-    persons=$(printf "use lodel2\ndb.Person.find\({}, {lodel_id:1, _id:0}\).limit\(3\)" | mongo  HOSTDB/admin -u lodel_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed '\$d')
+    persons=$(printf "use lodel2_$instance\n db.Person.find({}, {lodel_id:1, _id:0}).limit(3)" | mongo  $HOSTDB/admin -u lodel2_admin -p lapwd | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed "\$d")
     tmp=""
     for i in $persons
     do
-        if [ $tmp = "" ]
+        if [[ ! -z $tmp ]]
         then
-            tmp=$(printf("$tmp, $i"))
+            tmp=$(printf "$tmp, $i")
         else
             tmp=$i
         fi
     done
     SECLP=$tmp
-    SECST=$(lenmax=120;wcount=10; rlenmax=$(expr $lenmax - 1); echo $(shuf /usr/share/dict/words | head -n $wcount | tr -s "\n" " ") | sed -E "s/^(.{$rlenmax}).*$/\1/")
-    res=$(printf "use lodel2\ndb.Indextheme.find\({}, {lodel_id:1, _id:0}\).limit\(5\)" | mongo  HOSTDB/admin -u lodel_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed '\$d')
+    SECST=$(lenmax=60;wcount=10; rlenmax=$(expr $lenmax - 1); echo $(shuf /usr/share/dict/words | head -n $wcount | tr -s "\n" " ") | sed -E "s/^(.{$rlenmax}).*$/\1/")
+    res=$(printf "use lodel2_$instance\n db.Indextheme.find({}, {lodel_id:1, _id:0}).limit(5)" | mongo  $HOSTDB/admin -u lodel2_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed "\$d")
     tmp=""
     for i in $res
     do
-        if [ $tmp = "" ]
+        if [[ ! -z $tmp ]]
         then
-            tmp=$(printf("$tmp, $i"))
+            tmp=$(printf "$tmp, $i")
         else
             tmp=$i
         fi
+    done
     SECIND=$tmp
-    SECTTL=$(lenmax=100;wcount=5; rlenmax=$(expr $lenmax - 1); echo $(shuf /usr/share/dict/words | head -n $wcount | tr -s "\n" " ") | sed -E "s/^(.{$rlenmax}).*$/\1/")
+    SECTTL=$(lenmax=60;wcount=5; rlenmax=$(expr $lenmax - 1); echo $(shuf /usr/share/dict/words | head -n $wcount | tr -s "\n" " ") | sed -E "s/^(.{$rlenmax}).*$/\1/")
     curl -A "Mozilla/5.0" -L -s -d "field_input_linked_persons=$SECLP&field_input_subtitle=$SECST&field_input_indexes=$SECIND&field_input_title=$SECTTL&classname=Section" http://$host/$instance/admin/create?classname=Section
 done
 
-for i in ${seq $N}
+for i in `eval echo {1..$N}`;
 do
-    persons=$(printf "use lodel2\ndb.Person.find\({}, {lodel_id:1, _id:0}\).limit\(3\)" | mongo  HOSTDB/admin -u lodel_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed '\$d')
+    persons=$(printf "use lodel2_$instance\n db.Person.find({}, {lodel_id:1, _id:0}).limit(3)" | mongo  $HOSTDB/admin -u lodel2_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed "\$d")
     for i in $persons
     do
-        if [ $tmp = "" ]
+        if [[ ! -z $tmp ]]
         then
-            tmp=$(printf("$tmp, $i"))
+            tmp=$(printf "$tmp, $i")
         else
             tmp=$i
         fi
     done
     SSSECLP=$tmp
-    SSSECST=$(lenmax=120;wcount=10; rlenmax=$(expr $lenmax - 1); echo $(shuf /usr/share/dict/words | head -n $wcount | tr -s "\n" " ") | sed -E "s/^(.{$rlenmax}).*$/\1/")
-    res=$(printf "use lodel2\ndb.Section.find\({}, {lodel_id:1, _id:0}\).limit\(1\)" | mongo  HOSTDB/admin -u lodel_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed '\$d')
+    SSSECST=$(lenmax=60;wcount=10; rlenmax=$(expr $lenmax - 1); echo $(shuf /usr/share/dict/words | head -n $wcount | tr -s "\n" " ") | sed -E "s/^(.{$rlenmax}).*$/\1/")
+    res=$(printf "use lodel2_$instance\n db.Section.find({}, {lodel_id:1, _id:0}).limit(1)" | mongo  $HOSTDB/admin -u lodel2_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed "\$d")
     SSSECPAR=$res
-    res=$(printf "use lodel2\ndb.Indextheme.find\({}, {lodel_id:1, _id:0}\).limit\(3\)" | mongo  HOSTDB/admin -u lodel_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed '\$d')
+    res=$(printf "use lodel2_$instance\n db.Indextheme.find({}, {lodel_id:1, _id:0}).limit(3)" | mongo  $HOSTDB/admin -u lodel2_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed "\$d")
     tmp=""
     for i in $res
     do
-        if [ $tmp = "" ]
+        if [[ ! -z $tmp ]]
         then
-            tmp=$(printf("$tmp, $i"))
+            tmp=$(printf "$tmp, $i")
         else
             tmp=$i
         fi    
     SSSECIND=$tmp
-    SSSECTTL=$(lenmax=100;wcount=5; rlenmax=$(expr $lenmax - 1); echo $(shuf /usr/share/dict/words | head -n $wcount | tr -s "\n" " ") | sed -E "s/^(.{$rlenmax}).*$/\1/")
-    res=$(printf "use lodel2\ndb.Collection.find\({}, {lodel_id:1, _id:0}\).limit\(1\)" | mongo  HOSTDB/admin -u lodel_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed '\$d')
+    SSSECTTL=$(lenmax=60;wcount=5; rlenmax=$(expr $lenmax - 1); echo $(shuf /usr/share/dict/words | head -n $wcount | tr -s "\n" " ") | sed -E "s/^(.{$rlenmax}).*$/\1/")
+    res=$(printf "use lodel2_$instance\n db.Collection.find({}, {lodel_id:1, _id:0}).limit\(1\)" | mongo  $HOSTDB/admin -u lodel2_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed "\$d")
     PUBCOLLS=$res
     curl -A "Mozilla/5.0" -L -s -d "field_input_linked_persons=$SSSECLP&field_input_subtitle=$SSSECST&field_input_parent=$SSSECPAR&field_input_indexes=$SSSECIND&field_input_title=$SSSECTTL&classname=Subsection" http://$host/$instance/admin/create?classname=Subsection
 curl -A "Mozilla/5.0" -L -s -d "field_input_collection=$PUBCOLLS&classname=Publication" http://$host/$instance/admin/create?classname=Publication

progs/create_datas.sh

@@ -3,10 +3,12 @@
 host=$1
 instance=$2
 N=$3
-HOSTDB=localhost:27017
+HOSTDB=localhost
 
-for i in ${1..$N..10)
+M=$(expr $N / 10)
+for i in `eval echo {1..$M}`;
 do
+    COLPUBLI=""
     COLT=$(lenmax=100;wcount=5; rlenmax=$(expr $lenmax - 1); echo $(shuf /usr/share/dict/words | head -n $wcount | tr -s "\n" " ") | sed -E "s/^(.{$rlenmax}).*$/\1/") 
     curl -A "Mozilla/5.0" -L -s -d "field_input_title=$COLT&field_input_publications=$COLPUBLI&classname=Collection" http://$host/$instance/admin/create?classname=Collection
     ITTHM="themetest"
@@ -21,9 +23,10 @@ do
     curl -A "Mozilla/5.0" -L -s -d "field_input_lastname=$LN&field_input_firstname=$FN&field_input_password=$PWD&field_input_login=$LOGIN&classname=User" http://$host/$instance/admin/create?classname=User
 done
 
-for i in ${1..$N..4)
+M=$(expr $N / 4)
+for i in `eval echo {1..$M}`;
 do
-    persons=$(printf "use lodel2\ndb.Person.find\({}, {lodel_id:1, _id:0}\).limit\(3\)" | mongo  HOSTDB/admin -u lodel_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed '\$d')
+    persons=$(printf "use lodel2_$instance\n db.Person.find({}, {lodel_id:1, _id:0}).limit(3)" | mongo  $HOSTDB/admin -u lodel2_admin -p lapwd | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed "\$d")
     tmp=""
     for i in $persons
     do
@@ -46,12 +49,13 @@ do
         else
             tmp=$i
         fi
+    done
     SECIND=$tmp
     SECTTL=$(lenmax=100;wcount=5; rlenmax=$(expr $lenmax - 1); echo $(shuf /usr/share/dict/words | head -n $wcount | tr -s "\n" " ") | sed -E "s/^(.{$rlenmax}).*$/\1/")
     curl -A "Mozilla/5.0" -L -s -d "field_input_linked_persons=$SECLP&field_input_subtitle=$SECST&field_input_indexes=$SECIND&field_input_title=$SECTTL&classname=Section" http://$host/$instance/admin/create?classname=Section
 done
 
-for i in ${seq $N}
+for i in `eval echo {1..$N}`;
 do
     persons=$(printf "use lodel2\ndb.Person.find\({}, {lodel_id:1, _id:0}\).limit\(3\)" | mongo  HOSTDB/admin -u lodel_admin -p lapwd  | sed "1,3d" | sed -e "s/{ \"lodel_id\" : //g" | sed -e "s/ }//g" | sed '\$d')
     for i in $persons