Index: trunk/util/pcblib-param.cgi =================================================================== --- trunk/util/pcblib-param.cgi (revision 236) +++ trunk/util/pcblib-param.cgi (revision 237) @@ -10,7 +10,7 @@ { cd $gendir params=`echo $QS_cmd | sed "s/.*[(]//;s/[)]//" ` - ./connector "$params" + ./$gen "$params" } help() @@ -133,25 +133,24 @@ if test -z "$QS_cmd" then export QS_cmd='connector(2,3)' + export QS_diamond=1 + gen=connector else gen=`awk -v "n=$QS_cmd" ' BEGIN { sub("[(].*", "", n) - sub("[^a-zA-Z0-9_]", "", n) + gsub("[^a-zA-Z0-9_]", "", n) print n } '` - case "$gen" in - */|*/*) error "Invalid generator \"$gen\" (name)" ;; - *) - if test -z `grep "@@purpose" $gendir/$gen` - then - error "Invalid generator \"$gen\" (file)" - fi - esac + if test -z `grep "@@purpose" $gendir/$gen` + then + error "Invalid generator \"$gen\" (file)" + fi fi + if test "$QS_output" = "help" then echo "Content-type: text/html" @@ -160,6 +159,16 @@ exit fi +fptext=`gen` +if test ! "$?" = 0 +then + echo "Content-type: text/plain" + echo "" + echo "Error generating the footprint:" + gen 2>&1 | grep -i error + exit +fi + if test "$QS_output" = "text" then echo "Content-type: text/plain" @@ -177,11 +186,15 @@ then cparm="$cparm --mm" fi + if test ! -z "$QS_diamond" + then + cparm="$cparm --diamond" + fi if test ! -z "$QS_photo" then cparm="$cparm --photo" fi - (gen | /home/igor2/C/pcb-rnd/util/fp2anim $cparm; echo 'screenshot "/dev/stdout"') | /usr/local/bin/animator -H + (echo "$fptext" | /home/igor2/C/pcb-rnd/util/fp2anim $cparm; echo 'screenshot "/dev/stdout"') | /usr/local/bin/animator -H exit fi @@ -259,6 +272,7 @@ echo "" echo "

" echo "" @@ -282,7 +296,7 @@ echo "" echo "

"
-	gen
+	echo "$fptext"
 	echo "
" echo "

Downloads:" echo "
footprint file"