From c27b5d35c1e692cbe7471f73a79755626da37844 Mon Sep 17 00:00:00 2001 From: Michael Hanke Date: Sun, 15 May 2011 13:12:18 -0400 Subject: [PATCH] Group software selection into per domain arrays --- survey/Makefile | 5 +- survey/survey.rst | 220 ++++++++++++++++++------------------- survey/surveycollector.cgi | 6 +- 3 files changed, 117 insertions(+), 114 deletions(-) diff --git a/survey/Makefile b/survey/Makefile index 7806eab..51c9bad 100644 --- a/survey/Makefile +++ b/survey/Makefile @@ -18,7 +18,7 @@ oslist.txt: select_os_options.inc -e 's/" label="/: "/' -e 's/">.*$$/"/' > $@ swlist.txt: survey.rst - grep '"sw"' survey.rst | sed -e 's/.*name="sw" value="//' -e 's," />,: ",' \ + grep '"sw.*" value' survey.rst | sed -e 's/.*name="sw.*" value="//' -e 's," />,: ",' \ -e 's,$$,",' -e 's/ "$$/ "Other"/' > $@ datamodlist.txt: survey.rst @@ -27,6 +27,7 @@ datamodlist.txt: survey.rst upload: index.html jquery.form.js survey.css rsync -rvzlhp --delete \ - --exclude=Makefile --exclude='*.inc' --exclude='*.rst' \ + --exclude=Makefile --exclude='*.inc' --exclude='*.rst' --exclude='*.txt' \ + --exclude=makestats --exclude=surveydata --exclude='*.cgi' \ --chmod=Dg+s,g+rw * neurodebian@www.pymvpa.org:/home/www/neuro.debian.net/www/survey/ diff --git a/survey/survey.rst b/survey/survey.rst index 884cc67..a247b54 100644 --- a/survey/survey.rst +++ b/survey/survey.rst @@ -716,25 +716,25 @@ Generic computing/scripting/programming environments .. raw:: html - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + +
C/C++IDLLabVIEWLISRELMapleMathcadC/C++IDLLabVIEWLISRELMapleMathcad
MathematicaMatlabOctavePerlPythonRMathematicaMatlabOctavePerlPythonR
RubyScilabSPSSSCIRunShell scriptingRubyScilabSPSSSCIRunShell scripting
Distributed computing - frameworks and controllers @@ -743,12 +743,12 @@ Distributed computing - frameworks and controllers .. raw:: html - - - - - - + + + + + +
SGETorque/OpenPBS/MauiCondorGlobusMPI (any)IPythonSGETorque/OpenPBS/MauiCondorGlobusMPI (any)IPython
Imaging @@ -757,52 +757,52 @@ Imaging .. raw:: html - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - +
3D SlicerAFNIAeskulapAmide3D SlicerAFNIAeskulapAmide
BIRN ToolsBRAINS ToolsBioimage SuiteBrainMapBIRN ToolsBRAINS ToolsBioimage SuiteBrainMap
BrainVISA/AnatomistBrainVoyagerCMTKCaretBrainVISA/AnatomistBrainVoyagerCMTKCaret
ConnectomeViewerDSI StudioDTI-TKDiffusion Toolkit/TrackvisConnectomeViewerDSI StudioDTI-TKDiffusion Toolkit/Trackvis
FSLFijiFreeSurferITK-SNAPFSLFijiFreeSurferITK-SNAP
ImageJInvesaliusLONILipsiaImageJInvesaliusLONILipsia
MangoMIPAV/JISTMNI toolsMRIcronMangoMIPAV/JISTMNI toolsMRIcron
MRtrixMatlab MVPA toolboxNiBabel/PyNIfTINiPy/NiTime/DiPy/NiPypeMRtrixMatlab MVPA toolboxNiBabel/PyNIfTINiPy/NiTime/DiPy/NiPype
PyMVPARESTSPMV3DPyMVPARESTSPMV3D
VoxBoVoxBo
Data management @@ -811,8 +811,8 @@ Data management .. raw:: html - - + +
XNAT/PyXNAT/...Human Imaging Database (HID)XNAT/PyXNAT/...Human Imaging Database (HID)
Neural systems modeling @@ -821,16 +821,16 @@ Neural systems modeling .. raw:: html - - - - - - - - - - + + + + + + + + + +
BrianiqriNVTNEURONNESTGenesisMoosePCSIMPyNNTopographicaBrianiqriNVTNEURONNESTGenesisMoosePCSIMPyNNTopographica
Electrophysiology, MEG/EEG @@ -839,24 +839,24 @@ Electrophysiology, MEG/EEG .. raw:: html - - - - - - + + + + + + - - - - - - + + + + + + - - - - + + + +
BESABioSigBrainStormChronusEEGLABElekta NeuromagBESABioSigBrainStormChronusEEGLABElekta Neuromag
FieldtripKlustaKwikLORETA/sLORETAMNE suiteNeuroExplorerOpenMEEGFieldtripKlustaKwikLORETA/sLORETAMNE suiteNeuroExplorerOpenMEEG
OpenelectrophyRTXIRelacs?Trellis-neuroOpenelectrophyRTXIRelacs?Trellis-neuro
Brain-computer interface @@ -865,9 +865,9 @@ Brain-computer interface .. raw:: html - - - + + +
BCI2000OpenVIBEPyffBCI2000OpenVIBEPyff
Hardware interface/Data acquisition @@ -876,9 +876,9 @@ Hardware interface/Data acquisition .. raw:: html - - - + + +
ComediEPICSMXComediEPICSMX
Real-time solutions @@ -887,10 +887,10 @@ Real-time solutions .. raw:: html - - - - + + + +
RTAIXenomaiRTLinuxPREEMPT_RTRTAIXenomaiRTLinuxPREEMPT_RT
Psychophysics/Experimental control @@ -899,17 +899,17 @@ Psychophysics/Experimental control .. raw:: html - - - - - - + + + + + + - - - - + + + +
DMDXE-PrimePresentationPsychoPyPyEPLPsychtoolboxDMDXE-PrimePresentationPsychoPyPyEPLPsychtoolbox
PsytoolkitOpenSesameVisionEggTscopePsytoolkitOpenSesameVisionEggTscope
Other @@ -918,8 +918,8 @@ Other .. raw:: html - +
- (comma-separated list) + (comma-separated list)
--------------------------------------------------------------- diff --git a/survey/surveycollector.cgi b/survey/surveycollector.cgi index 84cbeea..3abd045 100755 --- a/survey/surveycollector.cgi +++ b/survey/surveycollector.cgi @@ -35,7 +35,7 @@ def extract_results(form, result): "pers_time", "pers_hardware", "pers_os", "man_time", "man_hardware", "man_os", "virt_time", "virt_other", "virt_guest_os", "virt_host_os", - "software_resource_other", "sw_other"]: + "software_resource_other", "sw_other", "sw_other_name"]: if ff in form: result[ff] = form[ff].value # integers @@ -45,7 +45,9 @@ def extract_results(form, result): if ff in form: result[ff] = int(form[ff].value) # lists - for ff in ["bg_datamod", "virt_prod", "software_resource", "sw"]: + for ff in ["bg_datamod", "virt_prod", "software_resource", "sw_general", + "sw_dc", "sw_img", "sw_datamanage", "sw_electro", "sw_neusys", + "sw_bci", "sw_acq", "sw_rt", "sw_psychphys"]: if ff in form: result[ff] = form.getlist(ff) -- 2.39.5