checkpoint

breck7 · May 10, 2024 · 51ea623 · 51ea623
1 parent 262b82c
commit 51ea623
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/download.scroll b/download.scroll
@@ -15,17 +15,14 @@ Download the CancerDB concept dataset as: CSV | TSV | JSON
 
 import measures/cancerDBMeasures.scroll
 loadConcepts concepts
-writeConcepts cancerdb.csv
-writeConcepts cancerdb.json
-writeConcepts cancerdb.tsv
+writeConcepts cancerdb.csv cancerdb.json cancerdb.tsv
+ sortBy -measurements
 
 Statistics on the measures (columns) are below and can be downloaded as: CSV | TSV | JSON
  link measures.csv CSV
  link measures.tsv TSV
  link measures.json JSON
-writeMeasures measures.tsv
-writeMeasures measures.csv
-writeMeasures measures.json
+writeMeasures measures.tsv measures.csv measures.json
 printMeasures
 tableSearch
 

diff --git a/measures/commonMeasures.scroll b/measures/commonMeasures.scroll
@@ -8,10 +8,7 @@ abstractHashMapMeasureParser
  extends abstractMeasureParser
  javascript
   get measureValue() {
-    return this.childrenToString()
-  }
-  get measureName() {
-    return this.definition.cruxPathAsColumnName
+    return this.content
   }
 
 abstractCountMeasureParser
@@ -52,7 +49,7 @@ abstractStringBlobMeasureParser
  baseParser blobParser
  javascript
   get measureValue() {
-    return this.childrenToString()
+    return this.childrenToString().replace(/\n/g, "\\n")
   }
 abstractDelimitedValuesBlobMeasureParser
  description A CSV, TSV, or other delimited blob of text.

diff --git a/package.json b/package.json
@@ -25,6 +25,6 @@
   "homepage": "https://cancerdb.com",
   "dependencies": {
     "lodash": "^4.17.21",
-    "scroll-cli": "^85.4.0"
+    "scroll-cli": "^85.6.0"
   }
 }