Merge branch 'f-xls-readme' into 'dev'

F xls readme

See merge request caosdb/caosdb-advanced-user-tools!62

CHANGELOG.md

@@ -16,6 +16,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   output
 - New class for collecting information for exporting tables, e.g., to
   metadata repositories
+- new name parsing
+- new test for software folder structure
+- new assure_name_is function
 
 ### Changed ###
 

integrationtests/crawl.py

@@ -33,7 +33,7 @@ from caosadvancedtools.cfood import fileguide
 from caosadvancedtools.crawler import FileCrawler
 from caosadvancedtools.guard import INSERT, UPDATE
 from scifolder import (AnalysisCFood, ExperimentCFood, ProjectCFood,
-                       PublicationCFood, SimulationCFood)
+                       PublicationCFood, SimulationCFood, SoftwareCFood)
 
 try:
     from sss_helper import get_argument_parser, print_success
@@ -87,7 +87,7 @@ if __name__ == "__main__":
     c = FileCrawler(files=files, use_cache=True,
                     interactive=False, hideKnown=False,
                     cfood_types=[ProjectCFood,
-                                 ExperimentCFood, AnalysisCFood,
+                                 ExperimentCFood, AnalysisCFood, SoftwareCFood,
                                  PublicationCFood, SimulationCFood,
                                  ])
 

integrationtests/extroot/DataAnalysis/2010_TestProject/2019-02-03_something/README.md

----
-responsible:	
-- First Person
-description: 	A description of an example analysis.
-
-results:
-- file:	"images/*.png"
-  description:  an example reference to a results file
-
-sources:
-- file: /ExperimentalData/2010_TestProject/2019-02-03_something/
-  description:  an example reference to an experiment
-
-revisionOf:
-- ../2019-02-03
-
-scripts:
-- analyse.py
-
-tags:
-- collagen
-- time sweep
-- frequency sweep
-...

integrationtests/extroot/Software/2010_TestSoftware/2019-02-03_V1.0-rc1/analyse.py

+sdkflj2435j4'4rg

integrationtests/extroot/Software/2010_TestSoftware/2019-02-03_V1.0-rc1/calc.py

+sldfkjsldfjk

integrationtests/extroot/Software/2010_TestSoftware/2019-02-03_v0.1/README.md

+---
+responsible: Responsible, Only
+description: 	A description of this example analysis.
+
+sources:
+- file:	"/ExperimentalData/2010_TestProject/2019-02-03/*.dat"
+  description:  an example reference to a results file
+
+sourceCode:
+- file: plot.py
+  description: a plotting script
+binaries:
+- file: example.deb
+  description: the binary file
+...

integrationtests/extroot/Software/2010_TestSoftware/2019-02-03_v0.1/example.deb

+binary file

integrationtests/extroot/Software/2020NewProject0X/2020-02-03/README.md

+---
+responsible:	
+- Only Responsible MPI DS
+description: 	A description of this example analysis.
+
+sources:
+- file:	"/ExperimentalData/2010_TestProject/2019-02-03/*.dat"
+  description:  an example reference to a results file
+
+sourceCode:
+- file: plot.py
+  description: a plotting script
+- file: calc.py
+  description: a calc script
+...

integrationtests/extroot/Software/2020NewProject0X/2020-02-03_second/release.deb

+kdjf

integrationtests/extroot/Software/2020NewProject0X/2020-02-04/README.md

+---
+responsible:	
+- Some Responsible
+- Responsible, No, MPI DS
+description: 	A description of this example analysis.
+
+sources:
+- file:	"/ExperimentalData/2010_TestProject/2019-02-03/*.dat"
+  description:  an example reference to a results file
+
+sourceCode: plot.py
+binaries:
+- file: example.deb
+  description: the binary file
+...

integrationtests/extroot/Software/2020NewProject0X/2020-02-04/example.deb

+binary file

integrationtests/filldb.sh

@@ -5,5 +5,6 @@ python3 -m caosadvancedtools.loadFiles /opt/caosdb/mnt/extroot/ExperimentalData
 python3 -m caosadvancedtools.loadFiles /opt/caosdb/mnt/extroot/DataAnalysis
 python3 -m caosadvancedtools.loadFiles /opt/caosdb/mnt/extroot/SimulationData
 python3 -m caosadvancedtools.loadFiles /opt/caosdb/mnt/extroot/Publications
+python3 -m caosadvancedtools.loadFiles /opt/caosdb/mnt/extroot/Software
 python3 insert_model.py 
 python3 crawl.py /