svn commit: r1648479 - in /lucene/dev/branches/branch_5x/solr: CHANGES.txt bin/post

[eh...@apache.org]

Author: ehatcher
Date: Tue Dec 30 03:41:08 2014
New Revision: 1648479

URL: http://svn.apache.org/r1648479
Log:
SOLR-6435: Added bin/post

Added:
    lucene/dev/branches/branch_5x/solr/bin/post   (with props)
Modified:
    lucene/dev/branches/branch_5x/solr/CHANGES.txt

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1648479&r1=1648478&r2=1648479&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Tue Dec 30 03:41:08 2014
@@ -222,6 +222,8 @@ New Features
 * SOLR-6851: Scripts to support installing and running Solr as a service on Linux
   (Timothy Potter, Hossman, Steve Rowe)
   
+* SOLR-6435: Add bin/post script to simplify posting content to Solr (ehatcher)
+
 Bug Fixes
 ----------------------
 

Added: lucene/dev/branches/branch_5x/solr/bin/post
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/bin/post?rev=1648479&view=auto
==============================================================================
--- lucene/dev/branches/branch_5x/solr/bin/post (added)
+++ lucene/dev/branches/branch_5x/solr/bin/post Tue Dec 30 03:41:08 2014
@@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Usage:
+#  bin/post <collection> <file(s)|url> [<params to SimplePostTool>]
+#  bin/post gettingstarted http://lucidworks.com [recursive=1] [delay=1]
+#  bin/post tehfiles ~/Documents
+#  bin/post signals LATEST-signals.csv
+#  bin/post records article*.xml
+#  bin/post wizbang events.json
+
+# ====== Common code copied from bin/solr (TODO: centralize/share this kind of thing)
+if [ -n "$SOLR_JAVA_HOME" ]; then
+  JAVA=$SOLR_JAVA_HOME/bin/java
+elif [ -n "$JAVA_HOME" ]; then
+  for java in "$JAVA_HOME"/bin/amd64/java "$JAVA_HOME"/bin/java; do
+    if [ -x "$java" ]; then
+      JAVA="$java"
+      break
+    fi
+  done
+else
+  JAVA=java
+fi
+
+# test that Java exists and is executable on this server
+$JAVA -version >/dev/null 2>&1 || { echo >&2 "Java is required to run this tool! Please install Java 8 or greater before running this script."; exit 1; }
+
+
+# ===== post specific code
+SPT_JAR=dist/solr-core-*.jar
+
+COLLECTION=$1; shift
+
+echo "Collection:" $COLLECTION
+
+PROPS="-Dc=$COLLECTION"
+PARAMS=""
+
+# TODO: Check that $COLLECTION actually exists?   How to determine if user omitted collection name as first param?
+
+echo -n "Data mode: "
+if [[ $1 == http* ]]; then
+  echo "WEB"
+  PROPS="$PROPS -Ddata=web"
+  PARAMS=$1; shift
+else
+  if [[ -d $1 ]]; then
+    # Directory
+    echo "DIRECTORY"
+    PROPS="$PROPS -Ddata=files -Dauto -Drecursive"
+    PARAMS=$1; shift
+  else
+    # Not a URL or existing directory, assume file(s)
+    echo "FILE"
+    FILE=$1; shift
+    EXTENSION="${FILE##*.}"
+
+    PARAMS=$FILE
+
+    if [[ $EXTENSION == xml || $EXTENSION == csv || $EXTENSION == json ]]; then
+      # Solr /update supported type (default being application/xml).
+      if [[ $EXTENSION == csv ]]; then
+        PROPS="$PROPS -Dtype=text/csv"
+      fi
+      if [[ $EXTENSION == json ]]; then
+        PROPS="$PROPS -Dtype=application/json"
+      fi
+    else
+      PROPS="$PROPS -Dauto=yes"
+    fi
+
+  fi
+fi
+
+# Add all additonal trailing script parameters as system properties to SPT (eg. bin/post core_name ~/Documents depth=1)
+while [ $# -gt 0 ]; do
+  PROPS="$PROPS -D$1"
+  shift
+done
+
+echo $JAVA -classpath $SPT_JAR $PROPS org.apache.solr.util.SimplePostTool $PARAMS
+$JAVA -classpath $SPT_JAR $PROPS org.apache.solr.util.SimplePostTool $PARAMS