Skip to content

Instantly share code, notes, and snippets.

(mmenv)administrator@anna:~/dev/monroeminutes$ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.revC.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
If you often merge with the same branch, you may want to
use something like the following in your configuration file:
(mmenv)administrator@anna:~/dev/monroeminutes/src$ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.revC.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
If you often merge with the same branch, you may want to
use something like the following in your configuration file:
(mmenv)administrator@anna:~/dev/monroeminutes/src$ git fetch origin
(mmenv)administrator@anna:~/dev/monroeminutes/src$ git merge origin/revC
Already up-to-date.
(mmenv)administrator@anna:~/dev/monroeminutes/src$ git checkout revA
warning: unable to rmdir src/BarkingOwl: Directory not empty
warning: unable to rmdir src/dler: Directory not empty
warning: unable to rmdir src/unpdfer: Directory not empty
Branch revA set up to track remote branch revA from origin.
Switched to a new branch 'revA'
(mmenv)administrator@anna:~/dev/monroeminutes/src$ git checkout --track origin/revC
import threading
#from myfuncs import myfunc
class MyThread(threading.Thread):
def __init__(self,name="mythread"):
threading.Thread.__init__(self)
self.name = name
administrator@anna:~$ curl -XPOST localhost:9200/monroeminutes/_export
{"error":"FileNotFoundException[monroeminutes.tar.gz (Permission denied)]","status":500}
administrator@anna:~$
I have an elastic search index with the following scheme:
# create entry
body = {'targeturl': urldata['targeturl'], # url of website being crawled
'docurl': docurl, # the url of the document
'docname': docname, # the name of the document
'linktext': linktext, # the text within the <a> tags
'pdftext': pdftext, # the full text of the document
'pdfhash': pdfhash, # the MD5 hash of the document
'scrapedatetime': scrapedatetime, # the datetime the document was found
.
.
.
.
/usr/bin/perl mk-sql.pl 'PostgreSQL 9.3.2' address_standardizer--1.0.sql.in > address_standardizer--1.0.sql
/usr/bin/perl pagc-data-psql lex lexicon.csv > us-lex.sql
/usr/bin/perl pagc-data-psql gaz gazeteer.csv > us-gaz.sql
/usr/bin/perl pagc-data-psql rules rules.txt > us-rules.sql
/bin/mkdir -p '/usr/lib/postgresql/9.3/lib'
/bin/mkdir -p '/usr/share/postgresql/9.3/extension'
.
.
.
.
.
/usr/bin/perl mk-sql.pl 'PostgreSQL 9.3.2' address_standardizer--1.0.sql.in > address_standardizer--1.0.sql
/usr/bin/perl pagc-data-psql lex lexicon.csv > us-lex.sql
/usr/bin/perl pagc-data-psql gaz gazeteer.csv > us-gaz.sql
/usr/bin/perl pagc-data-psql rules rules.txt > us-rules.sql
/bin/mkdir -p '/usr/lib/postgresql/9.3/lib'
{
"inmate": {
"last": "ABDUL-WAHHAB",
"dob": "1986-07-08 00:00:00",
"sex": "M",
"middle": "",
"race": "B",
"mcid": "344500",
"first": "KHALID"
},
[
{
"end_mile_point": "1.8",
"traffic_volume": 8877,
"end_longitude": -77.48515,
"name": "NY153",
"begin_longitude": -77.494148,
"functional_class": "16",
"giscode": "10009001",
"end_description": "COMMERCIAL ST",