Compare commits
	
		
			4 Commits
		
	
	
		
			visual-upd
			...
			9f64b83844
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 9f64b83844 | |||
| 0d469db020 | |||
| 38b3942bde | |||
| e834229cae | 
@@ -50,7 +50,10 @@ public class XmlController implements RestController {
 | 
				
			|||||||
    public void acceptRequestXslt(Request request, Response response) {
 | 
					    public void acceptRequestXslt(Request request, Response response) {
 | 
				
			||||||
        acceptRequest(request, response, XmlJobType.XSLT);
 | 
					        acceptRequest(request, response, XmlJobType.XSLT);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					    @ScopedControllerManifest(method = HandlerType.POST, path = "/xslt/addParam")
 | 
				
			||||||
 | 
					    public void acceptRequestXsltAddParam(Request request, Response response) {
 | 
				
			||||||
 | 
					        acceptRequest(request, response, XmlJobType.XSLT_PARAM);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    private void acceptRequest(Request request, Response response, XmlJobType xmlJobType) {
 | 
					    private void acceptRequest(Request request, Response response, XmlJobType xmlJobType) {
 | 
				
			||||||
        XMLRequestBody requestBody;
 | 
					        XMLRequestBody requestBody;
 | 
				
			||||||
        try {
 | 
					        try {
 | 
				
			||||||
@@ -129,6 +132,8 @@ public class XmlController implements RestController {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        String result = null;
 | 
					        String result = null;
 | 
				
			||||||
        switch (xmlJob.getXmlJobType()) {
 | 
					        switch (xmlJob.getXmlJobType()) {
 | 
				
			||||||
 | 
					            case XSLT_PARAM:
 | 
				
			||||||
 | 
					                result = engine.addParam(requestBody.getData(), requestBody.getProcessorData());
 | 
				
			||||||
            case XSLT:
 | 
					            case XSLT:
 | 
				
			||||||
                result = engine.processXSLT(requestBody.getData(), requestBody.getProcessorData());
 | 
					                result = engine.processXSLT(requestBody.getData(), requestBody.getProcessorData());
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
package com.r11.tools.controller.internal;
 | 
					package com.r11.tools.controller.internal;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public enum XmlJobType {
 | 
					public enum XmlJobType {
 | 
				
			||||||
    XPath("XPath"), XSD("XSD"), XQuery("XQuery"), XSLT("XSLT");
 | 
					    XPath("XPath"), XSD("XSD"), XQuery("XQuery"), XSLT("XSLT"), XSLT_PARAM("PARAM");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    XmlJobType(String type) {
 | 
					    XmlJobType(String type) {
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -164,4 +164,9 @@ public class Saxon implements XmlEngine{
 | 
				
			|||||||
    public String getVersion() {
 | 
					    public String getVersion() {
 | 
				
			||||||
        return "Saxon " + new Processor(false).getSaxonProductVersion();
 | 
					        return "Saxon " + new Processor(false).getSaxonProductVersion();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Override
 | 
				
			||||||
 | 
					    public String addParam(String data, String processorData) throws Exception {
 | 
				
			||||||
 | 
					        return null;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -124,6 +124,11 @@ public class Xalan implements XmlEngine{
 | 
				
			|||||||
        return org.apache.xalan.Version.getVersion();
 | 
					        return org.apache.xalan.Version.getVersion();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Override
 | 
				
			||||||
 | 
					    public String addParam(String data, String processorData) throws Exception {
 | 
				
			||||||
 | 
					        return null;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * Validates string representation of the xml document against xsd schema
 | 
					     * Validates string representation of the xml document against xsd schema
 | 
				
			||||||
     * @param data xml document
 | 
					     * @param data xml document
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,9 +9,7 @@ public interface XmlEngine {
 | 
				
			|||||||
    XPathQueryResult processXPath(String data, String query, String version) throws Exception;
 | 
					    XPathQueryResult processXPath(String data, String query, String version) throws Exception;
 | 
				
			||||||
    String processXSLT(String data, String transform) throws Exception;
 | 
					    String processXSLT(String data, String transform) throws Exception;
 | 
				
			||||||
    String validate(String data, String xsd) throws Exception;
 | 
					    String validate(String data, String xsd) throws Exception;
 | 
				
			||||||
 | 
					 | 
				
			||||||
    String executeXQuery(String data, String xquery, String version) throws Exception;
 | 
					    String executeXQuery(String data, String xquery, String version) throws Exception;
 | 
				
			||||||
 | 
					 | 
				
			||||||
    public String getVersion();
 | 
					    public String getVersion();
 | 
				
			||||||
 | 
					    String addParam(String data, String processorData) throws Exception;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										33
									
								
								Frontend/src/components/XsltParamComponent.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								Frontend/src/components/XsltParamComponent.vue
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,33 @@
 | 
				
			|||||||
 | 
					<script setup lang="ts">
 | 
				
			||||||
 | 
					import {defineComponent, ref} from 'vue'
 | 
				
			||||||
 | 
					const selected = ref('A')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					let options = ref([
 | 
				
			||||||
 | 
					  { text: 'One', value: 'A' },
 | 
				
			||||||
 | 
					  { text: 'Two', value: 'B' },
 | 
				
			||||||
 | 
					  { text: 'Three', value: 'C' }
 | 
				
			||||||
 | 
					])
 | 
				
			||||||
 | 
					</script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<template>
 | 
				
			||||||
 | 
					  <select v-model="selected" class="px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-2/3" >
 | 
				
			||||||
 | 
					    <option v-for="option in options" :value="option.value">
 | 
				
			||||||
 | 
					      {{ option.text }}
 | 
				
			||||||
 | 
					    </option>
 | 
				
			||||||
 | 
					  </select>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <input
 | 
				
			||||||
 | 
					      id="textInput1"
 | 
				
			||||||
 | 
					      class="text-input px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-1/3"
 | 
				
			||||||
 | 
					      type="text"
 | 
				
			||||||
 | 
					      placeholder="Name"
 | 
				
			||||||
 | 
					  />
 | 
				
			||||||
 | 
					  <input
 | 
				
			||||||
 | 
					      id="textInput2"
 | 
				
			||||||
 | 
					      class="text-input px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-1/3"
 | 
				
			||||||
 | 
					      type="text"
 | 
				
			||||||
 | 
					      placeholder="Value"
 | 
				
			||||||
 | 
					  />
 | 
				
			||||||
 | 
					  <button class="tool-button" @click="clear">Add Variable</button>
 | 
				
			||||||
 | 
					</template>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -2,13 +2,14 @@
 | 
				
			|||||||
import InsertTemplateComponent from '@components/common/InsertTemplateComponent.vue'
 | 
					import InsertTemplateComponent from '@components/common/InsertTemplateComponent.vue'
 | 
				
			||||||
import XMLButtonFormatterComponent from '@components/formatter/XMLButtonFormatterComponent.vue'
 | 
					import XMLButtonFormatterComponent from '@components/formatter/XMLButtonFormatterComponent.vue'
 | 
				
			||||||
import CodeEditor from '@/components/common/CodeEditorComponent.vue'
 | 
					import CodeEditor from '@/components/common/CodeEditorComponent.vue'
 | 
				
			||||||
 | 
					import XsltParamComponent from '@/components/XsltParamComponent.vue'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { ref } from 'vue'
 | 
					import {ref} from 'vue'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const props = defineProps(
 | 
					const props = defineProps(
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        stylizedName: {type: String, required: true},
 | 
					      stylizedName: {type: String, required: true},
 | 
				
			||||||
        data: {type: String},
 | 
					      data: {type: String},
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
const emit = defineEmits(['update:modelValue'])
 | 
					const emit = defineEmits(['update:modelValue'])
 | 
				
			||||||
@@ -17,54 +18,72 @@ const data = ref('')
 | 
				
			|||||||
const inputFile = ref()
 | 
					const inputFile = ref()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
function sendValue() {
 | 
					function sendValue() {
 | 
				
			||||||
    emit('update:modelValue', data.value)
 | 
					  emit('update:modelValue', data.value)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
function updateData(newData: string, clearFileSelector: boolean = true) {
 | 
					function updateData(newData: string, clearFileSelector: boolean = true) {
 | 
				
			||||||
    data.value = newData
 | 
					  data.value = newData
 | 
				
			||||||
    if (clearFileSelector)
 | 
					  if (clearFileSelector)
 | 
				
			||||||
        inputFile.value.value = '';
 | 
					    inputFile.value.value = '';
 | 
				
			||||||
    sendValue()
 | 
					  sendValue()
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
function clear() {
 | 
					function clear() {
 | 
				
			||||||
    updateData('')
 | 
					  updateData('')
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
function canBeFormatted() {
 | 
					function canBeFormatted() {
 | 
				
			||||||
    return props.stylizedName.toLowerCase() == 'xml' || 
 | 
					  return props.stylizedName.toLowerCase() == 'xml' ||
 | 
				
			||||||
           props.stylizedName.toLowerCase() == 'xsd' || 
 | 
					      props.stylizedName.toLowerCase() == 'xsd' ||
 | 
				
			||||||
           props.stylizedName.toLowerCase() == 'xslt'
 | 
					      props.stylizedName.toLowerCase() == 'xslt'
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
function readFile(file : any) {
 | 
					function addParameters() {
 | 
				
			||||||
    
 | 
					  return props.stylizedName?.toLowerCase() == "xslt"
 | 
				
			||||||
    const reader = new FileReader()
 | 
					 | 
				
			||||||
    reader.onloadend = () => {
 | 
					 | 
				
			||||||
        let result = reader.result?.toString()
 | 
					 | 
				
			||||||
        if (typeof result == "string")
 | 
					 | 
				
			||||||
            updateData(result, false);
 | 
					 | 
				
			||||||
            
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    reader.readAsText(file.target.files[0])
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					function readFile(file: any) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const reader = new FileReader()
 | 
				
			||||||
 | 
					  reader.onloadend = () => {
 | 
				
			||||||
 | 
					    let result = reader.result?.toString()
 | 
				
			||||||
 | 
					    if (typeof result == "string")
 | 
				
			||||||
 | 
					      updateData(result, false)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					  reader.readAsText(file.target.files[0])
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</script>
 | 
					</script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<template>
 | 
					<template>
 | 
				
			||||||
    <div class="flex flex-col w-full h-1/2 lg:h-1/2 flex-none xl:pr-2 2xl:pr-4 pb-2">
 | 
					  <div class="flex flex-col w-full h-1/2 lg:h-1/2 flex-none xl:pr-2 2xl:pr-4 pb-2">
 | 
				
			||||||
        <div class="flex place-content-between w-full items-center">
 | 
					    <div class="flex justify-between mb-2"></div>
 | 
				
			||||||
            <span class="dark:text-white mr-2">{{ stylizedName }}</span>
 | 
					
 | 
				
			||||||
            <div class="flex space-x-2 pb-2 overflow-x-auto">
 | 
					    <div class="flex place-content-between w-full items-center">
 | 
				
			||||||
                <div class="flex items-stretch w-64">
 | 
					
 | 
				
			||||||
                    <input id="fileLoader" ref="inputFile" class="file-selector" type="file" accept=".xml,.xql,.xquery,.xslt,text/xml,text/plain" @change="readFile" />
 | 
					      <span class="dark:text-white mr-2">{{ stylizedName }}</span>
 | 
				
			||||||
                </div>
 | 
					
 | 
				
			||||||
                
 | 
					      <div class="flex items-stretch w-64">
 | 
				
			||||||
                <InsertTemplateComponent :stylized-name="props.stylizedName" @update:default-data="updateData"></InsertTemplateComponent>
 | 
					        <input id="fileLoader" ref="inputFile" class="file-selector" type="file" accept=".xml,.xql,.xquery,.xslt,text/xml,text/plain" @change="readFile"/>
 | 
				
			||||||
                <XMLButtonFormatterComponent v-if="canBeFormatted()" :xml="data" @update:result="(data:any) => updateData(data.result)"></XMLButtonFormatterComponent>
 | 
					      </div>
 | 
				
			||||||
                <button class="tool-button" @click="clear">Clear</button>
 | 
					
 | 
				
			||||||
            </div>
 | 
					      <div class="flex space-x-2 pb-2 overflow-x-auto">
 | 
				
			||||||
        </div>
 | 
					        <InsertTemplateComponent :stylized-name="props.stylizedName" @update:default-data="updateData"></InsertTemplateComponent>
 | 
				
			||||||
        <CodeEditor @update:updated-code="updateData" v-model="data" :code="data" :config="{disabled:false, language:stylizedName}"></CodeEditor>
 | 
					        <XMLButtonFormatterComponent v-if="canBeFormatted()" :xml="data" @update:result="(data:any) => updateData(data.result)"></XMLButtonFormatterComponent>
 | 
				
			||||||
 | 
					        <button class="tool-button" @click="clear">Clear</button>
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <div class="flex place-content-between w-full items-center">
 | 
				
			||||||
 | 
					      <div v-if="addParameters()" class="flex justify-end space-x-2 pb-2 overflow-x-auto ml-auto">
 | 
				
			||||||
 | 
					        <XsltParamComponent :stylizedName="stylizedName"/>
 | 
				
			||||||
 | 
					      </div>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    <CodeEditor @update:updated-code="updateData" v-model="data" :code="data" :config="{disabled:false, language:stylizedName}"></CodeEditor>
 | 
				
			||||||
 | 
					  </div>
 | 
				
			||||||
</template>
 | 
					</template>
 | 
				
			||||||
		Reference in New Issue
	
	Block a user