Skip to content

Commit

Permalink
update the line endings
Browse files Browse the repository at this point in the history
  • Loading branch information
dwrobel1 committed Sep 27, 2012
1 parent 4421ca6 commit 6d8a1f4
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 52 deletions.
22 changes: 22 additions & 0 deletions .gitattributes
@@ -0,0 +1,22 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
104 changes: 52 additions & 52 deletions re_run_orchestra.sh
@@ -1,52 +1,52 @@
#!/bin/bash

check_errs()
{
# Function. Parameter 1 is the return code
# Para. 2 is text to display on failure.
if [ "${1}" -ne "0" ]; then
echo "ERROR: ${1} : ${2}"
exit ${1}
fi
}
PGUSER=devlincsweb
DATADIR=/groups/pharmacoresponse/data/dev

#/home/sde4/sql/drop-all.pl devlincs
./generate_drop_all.sh devlincsweb devlincs dev.pgsql.orchestra | psql -Udevlincsweb devlincs -h dev.pgsql.orchestra
check_errs $? "dropdb fails"

source /www/dev.lincs.hms.harvard.edu/support/virtualenv/bin/activate

django/manage.py syncdb
check_errs $? "syncdb fails"

echo 'import cell table ...'
python src/populate_cell.py sampledata/LINCS_Cells_20120727.xls 'HMS-LINCS cell line metadata'
check_errs $? "populate cell fails"

echo 'import small molecule...'
python src/populate_smallmolecule.py $DATADIR/HMS_LINCS-1.sdf
check_errs $? "import sdf fails"
python src/populate_smallmolecule.py $DATADIR/HMS_LINCS-2.sdf
check_errs $? "import sdf fails"

echo 'import kinases...'
python src/import_protein.py -f sampledata/HMS-LINCS_KinaseReagents_MetaData_20120906_DRAFT.xls
check_errs $? 'import kinases fails'

echo 'import screen results...'
python src/import_dataset.py -f sampledata/moerke_2color_IA-LM.xls
check_errs $? "import dataset fails"
python src/import_dataset.py -f sampledata/tang_MitoApop2_5637.xls
check_errs $? "import dataset result fails"

echo 'import studies'
python ./src/import_dataset.py -f sampledata/Study300002_HMSL10008_sorafenib_ambit.xls
check_errs $? "import study dataset fails"

python src/import_libraries.py -f sampledata/libraries.xls
check_errs $? "import library fails"

python src/create_indexes.py | psql -U devlincsweb devlincs -h dev.pgsql.orchestra -v ON_ERROR_STOP=1
#check_errs $? "create indexes fails"
#!/bin/bash

check_errs()
{
# Function. Parameter 1 is the return code
# Para. 2 is text to display on failure.
if [ "${1}" -ne "0" ]; then
echo "ERROR: ${1} : ${2}"
exit ${1}
fi
}
PGUSER=devlincsweb
DATADIR=/groups/pharmacoresponse/data/dev

#/home/sde4/sql/drop-all.pl devlincs
./generate_drop_all.sh devlincsweb devlincs dev.pgsql.orchestra | psql -Udevlincsweb devlincs -h dev.pgsql.orchestra
check_errs $? "dropdb fails"

source /www/dev.lincs.hms.harvard.edu/support/virtualenv/bin/activate

django/manage.py syncdb
check_errs $? "syncdb fails"

echo 'import cell table ...'
python src/populate_cell.py sampledata/LINCS_Cells_20120727.xls 'HMS-LINCS cell line metadata'
check_errs $? "populate cell fails"

echo 'import small molecule...'
python src/populate_smallmolecule.py $DATADIR/HMS_LINCS-1.sdf
check_errs $? "import sdf fails"
python src/populate_smallmolecule.py $DATADIR/HMS_LINCS-2.sdf
check_errs $? "import sdf fails"

echo 'import kinases...'
python src/import_protein.py -f sampledata/HMS-LINCS_KinaseReagents_MetaData_20120906_DRAFT.xls
check_errs $? 'import kinases fails'

echo 'import screen results...'
python src/import_dataset.py -f sampledata/moerke_2color_IA-LM.xls
check_errs $? "import dataset fails"
python src/import_dataset.py -f sampledata/tang_MitoApop2_5637.xls
check_errs $? "import dataset result fails"

echo 'import studies'
python ./src/import_dataset.py -f sampledata/Study300002_HMSL10008_sorafenib_ambit.xls
check_errs $? "import study dataset fails"

python src/import_libraries.py -f sampledata/libraries.xls
check_errs $? "import library fails"

python src/create_indexes.py | psql -U devlincsweb devlincs -h dev.pgsql.orchestra -v ON_ERROR_STOP=1
#check_errs $? "create indexes fails"

0 comments on commit 6d8a1f4

Please sign in to comment.