Skip to content

Commit

Permalink
Merge pull request #76 from clovis/master
Browse files Browse the repository at this point in the history 
Bug fixes
  • Loading branch information
@clovis
clovis authored Dec 3, 2018
2 parents 2ce6366 + db5b9cd commit e85dafc
Show file tree
Hide file tree
Showing 8 changed files with 959 additions and 745 deletions.
324 changes: 159 additions & 165 deletions config/appConfig.json
View file
Original file line number Diff line number Diff line change
@@ -1,167 +1,161 @@
{
"webServer": "Apache",
"appPath": "text-pair/",
"apiServer": "http://localhost/text-pair-api",
"databaseName": "alignment_db",
"databaseLabel": "Text Alignments",
"sourceDB": {
"philoDB": false,
"link": ""
},
"targetDB": {
"philoDB": false,
"link": ""
},
"sourceLabel": "Source",
"targetLabel": "Target",
"metadataTypes": {
"source_passage": "TEXT",
"source_author": "TEXT",
"source_title": "TEXT",
"source_year": "INTEGER",
"source_passage_length": "INTEGER",
"target_passage": "TEXT",
"target_author": "TEXT",
"target_title": "TEXT",
"target_year": "INTEGER",
"target_passage_length": "INTEGER"
},
"sourceCitation": [
{
"field": "source_author",
"style": {}
},
{
"field": "source_title",
"style": {}
},
{
"field": "source_year",
"style": {}
}
],
"targetCitation": [
{
"field": "target_author",
"style": {}
},
{
"field": "target_title",
"style": { "font-style": "italic" }
},
{
"field": "target_year",
"style": {}
}
],
"metadataFields": {
"source": [
{
"label": "Passage",
"value": "source_passage"
},
{
"label": "Author",
"value": "source_author"
},
{
"label": "Title",
"value": "source_title"
},
{
"label": "Year",
"value": "source_year"
},
{
"label": "Passage Length",
"value": "source_passage_length"
}
],
"target": [
{
"label": "Passage",
"value": "target_passage"
},
{
"label": "Author",
"value": "target_author"
},
{
"label": "Title",
"value": "target_title"
},
{
"label": "Year",
"value": "target_year"
},
{
"label": "Passage Length",
"value": "target_passage_length"
}
]
},
"facetsFields": {
"source": [
{
"label": "Passage",
"value": "source_passage"
},
{
"label": "Author",
"value": "source_author"
},
{
"label": "Title",
"value": "source_title"
},
{
"label": "Year",
"value": "source_year"
},
{
"label": "Passage Length",
"value": "source_passage_length"
}
],
"target": [
{
"label": "Passage",
"value": "target_passage"
},
{
"label": "Author",
"value": "target_author"
},
{
"label": "Title",
"value": "target_title"
},
{
"label": "Year",
"value": "target_year"
},
{
"label": "Passage Length",
"value": "source_passage_length"
}
]
},
"timeSeriesIntervals": [
{
"label": "Year",
"value": 1
},
{
"label": "Decade",
"value": 10
},
{
"label": "Half Century",
"value": 50
},
{
"label": "Century",
"value": 100
}
]
"webServer": "Apache",
"appPath": "text-pair/",
"apiServer": "http://localhost/text-pair-api",
"databaseName": "alignment_db",
"databaseLabel": "Text Alignments",
"sourcePhiloDBLink": "",
"targetPhiloDBLink": "",
"sourceLabel": "Source",
"targetLabel": "Target",
"metadataTypes": {
"source_passage": "TEXT",
"source_author": "TEXT",
"source_title": "TEXT",
"source_year": "INTEGER",
"source_passage_length": "INTEGER",
"target_passage": "TEXT",
"target_author": "TEXT",
"target_title": "TEXT",
"target_year": "INTEGER",
"target_passage_length": "INTEGER"
},
"sourceCitation": [
{
"field": "source_author",
"style": {}
},
{
"field": "source_title",
"style": {}
},
{
"field": "source_year",
"style": {}
}
],
"targetCitation": [
{
"field": "target_author",
"style": {}
},
{
"field": "target_title",
"style": { "font-style": "italic" }
},
{
"field": "target_year",
"style": {}
}
],
"metadataFields": {
"source": [
{
"label": "Passage",
"value": "source_passage"
},
{
"label": "Author",
"value": "source_author"
},
{
"label": "Title",
"value": "source_title"
},
{
"label": "Year",
"value": "source_year"
},
{
"label": "Passage Length",
"value": "source_passage_length"
}
],
"target": [
{
"label": "Passage",
"value": "target_passage"
},
{
"label": "Author",
"value": "target_author"
},
{
"label": "Title",
"value": "target_title"
},
{
"label": "Year",
"value": "target_year"
},
{
"label": "Passage Length",
"value": "target_passage_length"
}
]
},
"facetsFields": {
"source": [
{
"label": "Passage",
"value": "source_passage"
},
{
"label": "Author",
"value": "source_author"
},
{
"label": "Title",
"value": "source_title"
},
{
"label": "Year",
"value": "source_year"
},
{
"label": "Passage Length",
"value": "source_passage_length"
}
],
"target": [
{
"label": "Passage",
"value": "target_passage"
},
{
"label": "Author",
"value": "target_author"
},
{
"label": "Title",
"value": "target_title"
},
{
"label": "Year",
"value": "target_year"
},
{
"label": "Passage Length",
"value": "source_passage_length"
}
]
},
"timeSeriesIntervals": [
{
"label": "Year",
"value": 1
},
{
"label": "Decade",
"value": 10
},
{
"label": "Half Century",
"value": 50
},
{
"label": "Century",
"value": 100
}
]
}
6 changes: 2 additions & 4 deletions config/config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,5 @@ source_year = INTEGER
target_year = INTEGER

# Link aligments to PhiloLogic databases
source_database = false
source_database_link =
target_database = false
target_database_link =
source_philo_db_link =
target_philo_db_link =
Loading

0 comments on commit e85dafc

Please sign in to comment.