Allow localhost "load" links with no file parameter (genome only). Re…

…ference issue igvteam#339
david-w-mead · Dec 14, 2016 · 6e4b09e · 6e4b09e
1 parent 9d7dbd2
commit 6e4b09e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/src/org/broad/igv/batch/CommandExecutor.java b/src/org/broad/igv/batch/CommandExecutor.java
@@ -467,6 +467,7 @@ String loadFiles(final String fileString,
 
         log.debug("Run load files");
 
+
         List<String> files = StringUtils.breakQuotedString(fileString, ',');
         List<String> names = StringUtils.breakQuotedString(nameString, ',');
         List<String> indexFiles = StringUtils.breakQuotedString(indexString, ',');

diff --git a/src/org/broad/igv/batch/CommandListener.java b/src/org/broad/igv/batch/CommandListener.java
@@ -349,7 +349,7 @@ private String processGet(String command, Map<String, String> params, CommandExe
                 String sortTag = params.get("sortTag");
                 result = cmdExe.loadFiles(file, index, coverage, name, format, locus, merge, params, sort, sortTag);
             } else {
-                return ("ERROR Parameter \"file\" is required");
+                result = "OK";  // No files, perhaps genome only
             }
         } else if (command.equals("/reload") || command.equals("/goto")) {
             String locus = params.get("locus");

diff --git a/web/StaticLinkExamples.html b/web/StaticLinkExamples.html
@@ -6,27 +6,33 @@
     <title></title>
 </head>
 <body>
-<p><a href="http://www.broadinstitute.org/igv/projects/dev/launch.php?sessionURL=http://www.broadinstitute.org/igvdata/encode/hg19/broadEncode/wgEncodeBroadHistoneGm12878ControlStdSig.bigWig&amp;genome=hg19&amp;name=Gm12878&amp;merge=false">
-     Dev launch link with name, merge = false</a></p>
-<p><a href="http://www.broadinstitute.org/igv/projects/current/launch.php?sessionURL=http://www.broadinstitute.org/igvdata/encode/hg19/broadEncode/wgEncodeBroadHistoneGm12878ControlStdSig.bigWig&amp;genome=hg19&amp;name=Gm12878">
-     Prod launch link with name</a></p>
-<p><a href="http://www.broadinstitute.org/igv/projects/current/launch.php?sessionURL=http://www.broadinstitute.org/igvdata/encode/hg19/broadEncode/wgEncodeBroadHistoneGm12878ControlStdSig.bigWig&amp;genome=hg19&amp;name=Gm12878&amp;merge=false">
-     Prod launch link with name, merge = false</a></p>
-<p><a href="http://www.broadinstitute.org/igv/projects/current/igv.php?sessionURL=http://www.broadinstitute.org/igvdata/encode/hg19/broadEncode/wgEncodeBroadHistoneGm12878ControlStdSig.bigWig&amp;genome=hg19&amp;name=Gm12878">
-     Prod igv.php link with name</a></p>
-<p><a href="http://localhost:60151/load?file=http://www.broadinstitute.org/igvdata/annotations/hg18/conservation/pi.12mer.wig.tdf&amp;locus=egfr&amp;name=CONS">
-    Direct load with name</a></p>
-<p><a href="http://localhost:60151/load?file=http://www.broadinstitute.org/igvdata/annotations/hg18/conservation/pi.12mer.wig.tdf&amp;locus=egfr&amp;name=CONS&amp;merge=false">
-    Direct load with name, merge = false</a></p>
-<p><a href="http://localhost:60151/load?file=http://www.broadinstitute.org/igvdata/annotations/hg18/conservation/pi.12mer.wig.tdf">
-    Direct load no name</a></p>
+<p>
+    <a href="http://www.broadinstitute.org/igv/projects/dev/launch.php?sessionURL=http://www.broadinstitute.org/igvdata/encode/hg19/broadEncode/wgEncodeBroadHistoneGm12878ControlStdSig.bigWig&amp;genome=hg19&amp;name=Gm12878&amp;merge=false">
+        Dev launch link with name, merge = false</a></p>
+<p>
+    <a href="http://www.broadinstitute.org/igv/projects/current/launch.php?sessionURL=http://www.broadinstitute.org/igvdata/encode/hg19/broadEncode/wgEncodeBroadHistoneGm12878ControlStdSig.bigWig&amp;genome=hg19&amp;name=Gm12878">
+        Prod launch link with name</a></p>
+<p>
+    <a href="http://www.broadinstitute.org/igv/projects/current/launch.php?sessionURL=http://www.broadinstitute.org/igvdata/encode/hg19/broadEncode/wgEncodeBroadHistoneGm12878ControlStdSig.bigWig&amp;genome=hg19&amp;name=Gm12878&amp;merge=false">
+        Prod launch link with name, merge = false</a></p>
+<p>
+    <a href="http://www.broadinstitute.org/igv/projects/current/igv.php?sessionURL=http://www.broadinstitute.org/igvdata/encode/hg19/broadEncode/wgEncodeBroadHistoneGm12878ControlStdSig.bigWig&amp;genome=hg19&amp;name=Gm12878">
+        Prod igv.php link with name</a></p>
+<p>
+    <a href="http://localhost:60151/load?file=http://www.broadinstitute.org/igvdata/annotations/hg18/conservation/pi.12mer.wig.tdf&amp;locus=egfr&amp;name=CONS">
+        Direct load with name</a></p>
+<p>
+    <a href="http://localhost:60151/load?file=http://www.broadinstitute.org/igvdata/annotations/hg18/conservation/pi.12mer.wig.tdf&amp;locus=egfr&amp;name=CONS&amp;merge=false">
+        Direct load with name, merge = false</a></p>
+<p>
+    <a href="http://localhost:60151/load?file=http://www.broadinstitute.org/igvdata/annotations/hg18/conservation/pi.12mer.wig.tdf">
+        Direct load no name</a></p>
 <p><a href="http://localhost:60151/execute?command=sort+yourTack">
     Batch sort</a></p>
-
 <p>
-    <a href="http://www.broadinstitute.org/igv/projects/dev/launch.php?sessionURL=http://1000genomes.s3.amazonaws.com/data/NA12878/high_coverage_alignment/NA12878.mapped.ILLUMINA.bwa.CEU.high_coverage_pcr_free.20130520.bam,http://www.broadinstitute.org/igvdata/annotations/hg19/EnsemblGenes.ensGene,http://www.broadinstitute.org/igvdata/annotations/hg19/dbSnp/snp137.hg19.bed.gz&amp;index=http://1000genomes.s3.amazonaws.com/data/NA12878/high_coverage_alignment/NA12878.mapped.ILLUMINA.bwa.CEU.high_coverage_pcr_free.20130520.bam.bai,,http://www.broadinstitute.org/igvdata/annotations/hg19/dbSnp/snp137.hg19.bed.gz.tbi&amp;genome=hg19>
-    Dev launch link with name, merge = false</a></p>
-
-</p>
+    <a href="http://www.broadinstitute.org/igv/projects/dev/launch.php?sessionURL=http://1000genomes.s3.amazonaws.com/data/NA12878/high_coverage_alignment/NA12878.mapped.ILLUMINA.bwa.CEU.high_coverage_pcr_free.20130520.bam,http://www.broadinstitute.org/igvdata/annotations/hg19/EnsemblGenes.ensGene,http://www.broadinstitute.org/igvdata/annotations/hg19/dbSnp/snp137.hg19.bed.gz&amp;index=http://1000genomes.s3.amazonaws.com/data/NA12878/high_coverage_alignment/NA12878.mapped.ILLUMINA.bwa.CEU.high_coverage_pcr_free.20130520.bam.bai,,http://www.broadinstitute.org/igvdata/annotations/hg19/dbSnp/snp137.hg19.bed.gz.tbi&amp;genome=hg19">
+        Dev launch link with name, merge = false</a></p>
+<p><a href="http://localhost:60151/load?genome=hg19">
+    Load genome</a></p>
 </body>
-</html>
+</html>