Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6cd211f744 |
@@ -108,9 +108,13 @@ object PdfScheduleParser {
|
|||||||
|
|
||||||
for (dayCell in daysColumn.cells) {
|
for (dayCell in daysColumn.cells) {
|
||||||
val day = content(dayCell).split(' ')
|
val day = content(dayCell).split(' ')
|
||||||
|
if(day.size == 1) {
|
||||||
|
Log.v(TAG, "day.first(): ${day.first()}")
|
||||||
|
}
|
||||||
if(day.size == 1 && day.first() == "День") {
|
if(day.size == 1 && day.first() == "День") {
|
||||||
val groupCell = select(lessonsColumn, dayCell).firstOrNull() ?: continue
|
val groupCell = select(lessonsColumn, dayCell).firstOrNull() ?: continue
|
||||||
group = content(groupCell)
|
group = content(groupCell)
|
||||||
|
Log.v(TAG, "Group: $group")
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if(day.size != 2) {
|
if(day.size != 2) {
|
||||||
@@ -164,7 +168,7 @@ object PdfScheduleParser {
|
|||||||
val teacher = raw.substring(typeMatch.last().range.last+1, raw.length - room.length).trim()
|
val teacher = raw.substring(typeMatch.last().range.last+1, raw.length - room.length).trim()
|
||||||
var subgroup: String? = null
|
var subgroup: String? = null
|
||||||
Log.d(TAG, "$subject $group")
|
Log.d(TAG, "$subject $group")
|
||||||
if(group != null && subject.startsWith("$group,")) {
|
if(group != null && (subject.startsWith("$group,") || subject.startsWith("$group "))) {
|
||||||
subject = subject.substring(group.length + 1).trim()
|
subject = subject.substring(group.length + 1).trim()
|
||||||
val subgroupMatch = SUBGROUP_REGEX.find(subject)
|
val subgroupMatch = SUBGROUP_REGEX.find(subject)
|
||||||
if(subgroupMatch != null) {
|
if(subgroupMatch != null) {
|
||||||
@@ -197,6 +201,7 @@ object PdfScheduleParser {
|
|||||||
|
|
||||||
/** Вывод таблички из PDF в SVG формате + отладочные жлементы из [Pdf2Table.asTable] **/
|
/** Вывод таблички из PDF в SVG формате + отладочные жлементы из [Pdf2Table.asTable] **/
|
||||||
Log.v(SVG_TAG, "====")
|
Log.v(SVG_TAG, "====")
|
||||||
|
Log.v(SVG_TAG+ "-" + (pageIndex+1), "====")
|
||||||
for(line in svg.asSvg().split("\n")) {
|
for(line in svg.asSvg().split("\n")) {
|
||||||
if(line.length > 250) {
|
if(line.length > 250) {
|
||||||
Log.v(SVG_TAG, "length: " + line.length)
|
Log.v(SVG_TAG, "length: " + line.length)
|
||||||
|
|||||||
Reference in New Issue
Block a user