Skip to content

Commit

Permalink
Update frequency count of strong counts
Browse files Browse the repository at this point in the history
  • Loading branch information
@patricksptang
patricksptang committed Oct 14, 2024
1 parent 683d25b commit 11121eb
Show file tree
Hide file tree
Showing 16 changed files with 6,033 additions and 6,038 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>24.10.2</version>
<version>24.10.3</version>
<packaging>pom</packaging>
<name>STEP :: Scripture Tools for Every pastor</name>

Expand Down
2 changes: 1 addition & 1 deletion step-assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>step-mvn</artifactId>
<groupId>com.tyndalehouse.step</groupId>
<version>24.10.2</version>
<version>24.10.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion step-build/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>24.10.2</version>
<version>24.10.3</version>
</parent>

<artifactId>step-build</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion step-core-data/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>24.10.2</version>
<version>24.10.3</version>
</parent>

<artifactId>step-core-data</artifactId>
Expand Down
4,701 changes: 2,348 additions & 2,353 deletions ...-data/src/main/resources/com/tyndalehouse/step/core/data/create/lexicon/lexicon_greek.txt
View file

Large diffs are not rendered by default.

7,279 changes: 3,639 additions & 3,640 deletions ...data/src/main/resources/com/tyndalehouse/step/core/data/create/lexicon/lexicon_hebrew.txt
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion step-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>24.10.2</version>
<version>24.10.3</version>
</parent>

<groupId>com.tyndalehouse.step</groupId>
Expand Down
65 changes: 33 additions & 32 deletions step-core/src/main/java/com/tyndalehouse/step/core/xsl/impl/ColorCoderProviderImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ public ColorCoderProviderImpl(final EntityManager manager) {
* @return the classname
*/
public String getColorClass(final String morph) {
if (morph == null || morph.length() < MINIMUM_MORPH_LENGTH || morph.startsWith("TOS:") || morph.startsWith("oshm:"))
if (morph == null || morph.length() < MINIMUM_MORPH_LENGTH || morph.startsWith("TOS:") ||
morph.startsWith("oshm:") || morph.startsWith("H"))
return "";
String classes = null;
String curMorph;
Expand Down Expand Up @@ -138,37 +139,37 @@ else if ((voice.indexOf("active") > -1) || (voice.indexOf("deponent") > -1) || (
}
}
/* Added this section for the Chinese Bible which has the morphology on verbs */
else if (curMorph.length() > 4) {
if (curMorph.substring(0,1).equalsIgnoreCase("v")) {
String tense = curMorph.substring(2,3).toLowerCase();
String voice = curMorph.substring(3,4).toLowerCase();
String mood = curMorph.substring(4,5).toLowerCase();
if (tense.equals("2")) {
tense = curMorph.substring(3,4).toLowerCase();
voice = curMorph.substring(4,5).toLowerCase();
mood = curMorph.substring(5,6).toLowerCase();
}
if (voice.equals("e")) {
voice = "p";
}
else if ( (!(voice.equals("p"))) && (!(voice.equals("m"))) ) {
String voice_displayed_as_active = "adnoqx"; // active, middle deponent, middle or passive deponent, passive deponent, impersonal active, indefinite
if (voice_displayed_as_active.indexOf(voice) == -1) {
LOGGER.warn("cannot identify morphology for [{}]", curMorph);
}
voice = "a";
}
classes = "v" + tense + voice + mood;

if (classes == null) {
LOGGER.warn("cannot identify morphology for [{}]", curMorph);
}
}
else {
if (!curMorph.substring(0,1).equals("H"))
LOGGER.warn("other than verb [{}]", curMorph);
}
}
// else if (curMorph.length() > 4) {
// if (curMorph.substring(0,1).equalsIgnoreCase("v")) {
// String tense = curMorph.substring(2,3).toLowerCase();
// String voice = curMorph.substring(3,4).toLowerCase();
// String mood = curMorph.substring(4,5).toLowerCase();
// if (tense.equals("2")) {
// tense = curMorph.substring(3,4).toLowerCase();
// voice = curMorph.substring(4,5).toLowerCase();
// mood = curMorph.substring(5,6).toLowerCase();
// }
// if (voice.equals("e")) {
// voice = "p";
// }
// else if ( (!(voice.equals("p"))) && (!(voice.equals("m"))) ) {
// String voice_displayed_as_active = "adnoqx"; // active, middle deponent, middle or passive deponent, passive deponent, impersonal active, indefinite
// if (voice_displayed_as_active.indexOf(voice) == -1) {
// LOGGER.warn("cannot identify morphology for [{}]", curMorph);
// }
// voice = "a";
// }
// classes = "v" + tense + voice + mood;
//
// if (classes == null) {
// LOGGER.warn("cannot identify morphology for [{}]", curMorph);
// }
// }
// else {
// if (!curMorph.substring(0,1).equals("H"))
// LOGGER.warn("other than verb [{}]", curMorph);
// }
// }

if (isBlank(classes) && firstSpace != -1) {
// redo the same process, but with less of the string,
Expand Down
2 changes: 1 addition & 1 deletion step-packages/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>24.10.2</version>
<version>24.10.3</version>
</parent>

<groupId>com.tyndalehouse.step</groupId>
Expand Down
2 changes: 1 addition & 1 deletion step-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>24.10.2</version>
<version>24.10.3</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion step-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>24.10.2</version>
<version>24.10.3</version>
</parent>

<groupId>com.tyndalehouse.step</groupId>
Expand Down
2 changes: 1 addition & 1 deletion step-tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>24.10.2</version>
<version>24.10.3</version>
</parent>

<groupId>com.tyndalehouse.step</groupId>
Expand Down
2 changes: 1 addition & 1 deletion step-tools/src/main/resources/scripts_to_prep_lexicon_augmented_strong/3_getWordFreq.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ sub collectWordsUsedByAStrong {
my %numOfPassagesForBasicStrong;
my @allVersions = ("ESV", "KJV", "NASB2020", "BSB", "HCSB", "RV_th", "WEB_th",
"ASV-TH", "ChiUn", "ChiUns", "NASB1995", "RWebster", "spaBES2018eb", "AraSVD");
my @hebrewVersions = ("THOT", "OSHB", "SP", "SPMT");
my @hebrewVersions = ("THOT", "OHB", "SP", "SPMT");
my @greekVersions = ("SBLG", "THGNT", "TR", "Byz", "WHNU", "Elzevir", "Antoniades", "KhmKCB", "LXX_th");
my @greekVersionsOTNT = ("ABEn", "ABGk");

Expand Down
2 changes: 1 addition & 1 deletion step-war-precompiled/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>step-mvn</artifactId>
<groupId>com.tyndalehouse.step</groupId>
<version>24.10.2</version>
<version>24.10.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion step-web-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>24.10.2</version>
<version>24.10.3</version>
</parent>

<groupId>com.tyndalehouse.step</groupId>
Expand Down
2 changes: 1 addition & 1 deletion step-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>24.10.2</version>
<version>24.10.3</version>
</parent>

<artifactId>step-web</artifactId>
Expand Down

0 comments on commit 11121eb

Please sign in to comment.