Skip to content

Commit

Permalink
Merge branch 'devel' of github.com:acdh-oeaw/vicav-app into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
@simar0at
simar0at committed Apr 15, 2024
2 parents 4d84385 + 0ee8984 commit 9eec3a9
Show file tree
Hide file tree
Showing 7 changed files with 360 additions and 39 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/starter.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
id: get_environment_from_git_ref
run: |
echo "Running on branch ${{ github.ref_name }}"
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
if [ "${{ github.ref }}" = "refs/heads/master" ]; then
echo "environment=production"
echo "environment=production" >> $GITHUB_OUTPUT
echo "environment_short=prod" >> $GITHUB_OUTPUT
Expand All @@ -66,6 +66,7 @@ jobs:
echo "public_url=$public_url" >> $GITHUB_OUTPUT
outputs:
PUBLIC_URL: ${{ steps.generate_public_url.outputs.public_url }}
environment: ${{ needs.setup_workflow_env.outputs.environment }}
generate_workflow_vars-tunocent:
needs: [setup_workflow_env]
environment:
Expand Down Expand Up @@ -183,13 +184,13 @@ jobs:
registry_root: ${{ needs.setup_workflow_env.outputs.registry_root }}
image_tagged: ${{ needs.setup_workflow_env.outputs.image_tagged }}
default_port: ${{ needs.setup_workflow_env.outputs.default_port }}
herokuish_base_image: ${{ needs.setup_workflow_env.outputs.herokuish_base_image }}
POSTGRES_ENABLED: ${{ needs.setup_workflow_env.outputs.POSTGRES_ENABLED }}
fetch-depth: ${{ fromJson(needs.setup_workflow_env.outputs.fetch-depth)}}
herokuish_base_image: ${{ needs.setup_workflow_env.outputs.herokuish_base_image }}
POSTGRES_ENABLED: false
submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
_3:
needs: [setup_workflow_env, generate_workflow_vars, _1, _2]
uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/deploy-cluster-2.yml@main
uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/deploy.yml@main
secrets: inherit
with:
environment: ${{ needs.generate_workflow_vars.outputs.environment}}
Expand All @@ -198,13 +199,13 @@ jobs:
APP_ROOT: ${{ needs.setup_workflow_env.outputs.APP_ROOT }}
SERVICE_ID: ${{ needs.setup_workflow_env.outputs.SERVICE_ID }}
PUBLIC_URL: ${{ needs.generate_workflow_vars.outputs.PUBLIC_URL }}
POSTGRES_ENABLED: ${{ needs.setup_workflow_env.outputs.POSTGRES_ENABLED == 'true'}}
POSTGRES_ENABLED: false
default_port: "${{ needs.setup_workflow_env.outputs.default_port}}"
fetch-depth: ${{ fromJson(needs.setup_workflow_env.outputs.fetch-depth)}}
submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
_3-tunocent:
needs: [setup_workflow_env, generate_workflow_vars-tunocent, _1-tunocent, _2]
uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/deploy-cluster-2.yml@main
uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/deploy.yml@main
secrets: inherit
with:
environment: ${{ needs.generate_workflow_vars-tunocent.outputs.environment}}
Expand Down Expand Up @@ -234,7 +235,7 @@ jobs:
submodules: ${{ needs.setup_workflow_env.outputs.submodules }}
_3-wibarab:
needs: [setup_workflow_env, generate_workflow_vars-wibarab, _1-wibarab, _2]
uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/deploy-cluster-2.yml@main
uses: acdh-oeaw/gl-autodevops-minimal-port/.github/workflows/deploy.yml@main
secrets: inherit
with:
environment: ${{ needs.generate_workflow_vars-wibarab.outputs.environment}}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
**/.DS_Store
OLDSITE/

# ide
.idea
node_modules/
backup
images/**/*.jpg
images/**/*.png
163 changes: 156 additions & 7 deletions viacv-app.xpr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,46 @@
<entry>
<String>scenario.associations</String>
<scenarioAssociation-array>
<scenarioAssociation>
<field name="url">
<String>../../vicav-content/anki-table-input.xml</String>
</field>
<field name="scenarioIds">
<list>
<String>csv-table</String>
</list>
</field>
<field name="scenarioTypes">
<list>
<String>XSL</String>
</list>
</field>
<field name="scenarioStorageLocations">
<list>
<Byte>2</Byte>
</list>
</field>
</scenarioAssociation>
<scenarioAssociation>
<field name="url">
<String>http://localhost:8984/vicav/project</String>
</field>
<field name="scenarioIds">
<list>
<String>menu-json</String>
</list>
</field>
<field name="scenarioTypes">
<list>
<String>XML</String>
</list>
</field>
<field name="scenarioStorageLocations">
<list>
<Byte>2</Byte>
</list>
</field>
</scenarioAssociation>
<scenarioAssociation>
<field name="url">
<String>doc.xml</String>
Expand Down Expand Up @@ -264,7 +304,7 @@
<null/>
</field>
<field name="name">
<String>printable</String>
<String>corpus_utterances_print</String>
</field>
<field name="baseURL">
<String></String>
Expand All @@ -282,7 +322,90 @@
<String></String>
</field>
<field name="inputXSLURL">
<String>${pdu}/xslt/printable_path.xslt</String>
<String>${pdu}/xslt/corpus_utterances_print.xsl</String>
</field>
<field name="inputXMLURL">
<String>${currentFileURL}</String>
</field>
<field name="defaultScenario">
<Boolean>false</Boolean>
</field>
<field name="isFOPPerforming">
<Boolean>false</Boolean>
</field>
<field name="type">
<String>XSL</String>
</field>
<field name="saveAs">
<Boolean>true</Boolean>
</field>
<field name="openInBrowser">
<Boolean>false</Boolean>
</field>
<field name="outputResource">
<null/>
</field>
<field name="openOtherLocationInBrowser">
<Boolean>false</Boolean>
</field>
<field name="locationToOpenInBrowserURL">
<null/>
</field>
<field name="openInEditor">
<Boolean>false</Boolean>
</field>
<field name="showInHTMLPane">
<Boolean>false</Boolean>
</field>
<field name="showInXMLPane">
<Boolean>true</Boolean>
</field>
<field name="showInSVGPane">
<Boolean>false</Boolean>
</field>
<field name="showInResultSetPane">
<Boolean>false</Boolean>
</field>
<field name="useXSLTInput">
<Boolean>true</Boolean>
</field>
<field name="xsltParams">
<list/>
</field>
<field name="cascadingStylesheets">
<String-array/>
</field>
<field name="xslTransformer">
<String>Saxon-HE</String>
</field>
<field name="extensionURLs">
<String-array/>
</field>
</scenario>
<scenario>
<field name="advancedOptionsMap">
<null/>
</field>
<field name="name">
<String>csv-table</String>
</field>
<field name="baseURL">
<String></String>
</field>
<field name="footerURL">
<String></String>
</field>
<field name="fOPMethod">
<String>pdf</String>
</field>
<field name="fOProcessorName">
<String>Apache FOP</String>
</field>
<field name="headerURL">
<String></String>
</field>
<field name="inputXSLURL">
<String>${pdu}/xslt/csv-table-export.xsl</String>
</field>
<field name="inputXMLURL">
<String>${currentFileURL}</String>
Expand Down Expand Up @@ -335,7 +458,7 @@
<field name="paramDescription">
<paramDescriptor>
<field name="localName">
<String>xslt</String>
<String>format</String>
</field>
<field name="prefix">
<null/>
Expand All @@ -346,7 +469,7 @@
</paramDescriptor>
</field>
<field name="value">
<String>file:/V:/basexVicav/webapp/vicav-app/xslt/corpus_utterances.xslt</String>
<String>csv-anki</String>
</field>
<field name="hasXPathValue">
<Boolean>false</Boolean>
Expand All @@ -372,7 +495,7 @@
<null/>
</field>
<field name="name">
<String>corpus_utterances_print</String>
<String>printable</String>
</field>
<field name="baseURL">
<String></String>
Expand All @@ -390,7 +513,7 @@
<String></String>
</field>
<field name="inputXSLURL">
<String>${pdu}/xslt/corpus_utterances_print.xsl</String>
<String>${pdu}/xslt/printable_path.xslt</String>
</field>
<field name="inputXMLURL">
<String>${currentFileURL}</String>
Expand Down Expand Up @@ -438,7 +561,32 @@
<Boolean>true</Boolean>
</field>
<field name="xsltParams">
<list/>
<list>
<transformationParameter>
<field name="paramDescription">
<paramDescriptor>
<field name="localName">
<String>xslt</String>
</field>
<field name="prefix">
<null/>
</field>
<field name="namespace">
<null/>
</field>
</paramDescriptor>
</field>
<field name="value">
<String>file:/V:/basexVicav/webapp/vicav-app/xslt/corpus_utterances.xslt</String>
</field>
<field name="hasXPathValue">
<Boolean>false</Boolean>
</field>
<field name="isStatic">
<Boolean>false</Boolean>
</field>
</transformationParameter>
</list>
</field>
<field name="cascadingStylesheets">
<String-array/>
Expand All @@ -457,6 +605,7 @@
</options>
</meta>
<projectTree name="viacv-app.xpr">
<folder path="../../vicav-content/"/>
<folder path="."/>
</projectTree>
</project>
2 changes: 1 addition & 1 deletion vicav.xqm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ declare
%rest:produces('application/problem+xml')
function vicav:get_profile($coll as xs:string, $id as xs:string*, $xsltfn as xs:string*, $print as xs:string*) {
let $generateTeiMarker := exists($xsltfn)
let $xsltfn := if (exists($xsltfn)) then $xsltfn else "profile_01.xslt"
let $xsltfn := if (exists($xsltfn)) then $xsltfn else "profile_vue.xslt"
return api-problem:or_result (prof:current-ns(),
vicav:_get_profile#6, [$coll, $id, $xsltfn, $print, $generateTeiMarker, '/profile'], map:merge((cors:header(()), vicav:return_content_header()))
)
Expand Down
5 changes: 3 additions & 2 deletions xslt/menu-json.xslt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<xsl:template match="panel|item">
<_ type="object">
<xsl:apply-templates select="@* except @type"/>
<title><xsl:value-of select="text()"/></title>
<title><xsl:value-of select="normalize-space(string-join(text(), ' '))"/></title>
<type><xsl:value-of select="local-name()"/></type>
<targetType>
<xsl:choose>
Expand All @@ -83,7 +83,7 @@
</targetType>
<label>
<xsl:variable name="caption" select="$captionFromMenuID(_:cleanID(data((@target, @xml:id)[1])))"/>
<xsl:value-of select="if (normalize-space($caption) eq '') then text() else $caption"/>
<xsl:value-of select="if (normalize-space($caption) eq '') then normalize-space(string-join(text(), ' ')) else $caption"/>
</label>
<xsl:choose>
<xsl:when test="contains(@xml:id, 'avBiblGeoMarkers')">
Expand Down Expand Up @@ -158,6 +158,7 @@
<params>
<textId><xsl:value-of select="_:cleanID(data((@target,@xml:id)[1]))"/></textId>
<teiSource><xsl:value-of select="$teiSource"/></teiSource>
<xsl:apply-templates select="params/*"/>
</params>
</xsl:otherwise>
</xsl:choose>
Expand Down
Loading

0 comments on commit 9eec3a9

Please sign in to comment.