search

openaire / OpenAIRE-Piwik-DSpace

OpenAIRE Piwik plugins for DSpace
4 stars 0 forks source link

Patch does not apply DSpace 6 #1

Closed joseagaleanoc closed 5 years ago

joseagaleanoc commented 5 years ago 
[root@############ dspace]# git apply --check piwik-openaire-dspace6.diff
error: patch failed: dspace/config/dspace.cfg:2025
error: dspace/config/dspace.cfg: patch does not apply
[root@@############ dspace]# git apply --check piwik-openaire-dspace6-sqlite-update.diff
error: dspace/config/modules/oapiwik.cfg: No existe el fichero o el directorio
error: dspace/modules/openaire-piwik/openaire-piwik-api/pom.xml: No existe el fichero o el directorio
error: dspace/modules/openaire-piwik/openaire-piwik-api/src/main/java/com/openaire/piwik/tracker/OpenAirePiwikTracker.java: No existe el fichero o el directorio
dimitrispie commented 5 years ago

Have you tried to apply the patch at the DSpace's source directory, i.e. not at the DSpace's installed folder.

joseagaleanoc commented 5 years ago

Yes I have applied the patch on the source folder and installation folder. On the source folder I get the error 

error: patch failed: dspace/config/dspace.cfg:2025
error: dspace/config/dspace.cfg: patch does not apply

And on the installed folder I get

error: patch failed: config/dspace.cfg:2025
error: config/dspace.cfg: patch does not apply
error: config/modules/jspui/pom.xml: No file was found
error: config/modules/pom.xml: No file was found
error: config/modules/xmlui/pom.xml: No file was found
error: dspace/pom.xml: No file was found
dimitrispie commented 5 years ago

Can you try to download the patch from this link? https://raw.githubusercontent.com/openaire/OpenAIRE-Piwik-DSpace/master/piwik-openaire-dspace6.diff

joseagaleanoc commented 5 years ago

Same errors are displayed

dimitrispie commented 5 years ago

Can you list the [dspace-src] folder structure?

joseagaleanoc commented 5 years ago 
.
├── dspace
│   ├── bin
│   │   ├── buildpath.bat
│   │   ├── dspace
│   │   ├── dspace.bat
│   │   ├── dspace-info.pl
│   │   ├── log-reporter
│   │   ├── make-handle-config
│   │   ├── start-handle-server
│   │   ├── start-handle-server.bat
│   │   └── validarAutores.sh
│   ├── config
│   │   ├── config-definition.xml
│   │   ├── controlled-vocabularies
│   │   ├── crosswalks
│   │   ├── dc2mods.cfg
│   │   ├── default.context.xml
│   │   ├── default.license
│   │   ├── dspace.cfg
│   │   ├── dspace.cfg20180904
│   │   ├── dstat.cfg
│   │   ├── dstat.map
│   │   ├── emails
│   │   ├── hibernate.cfg.xml
│   │   ├── input-forms.dtd
│   │   ├── input-forms.xml
│   │   ├── item-submission.dtd
│   │   ├── item-submission.xml
│   │   ├── launcher.xml
│   │   ├── local.cfg.EXAMPLE
│   │   ├── log4j-console.properties
│   │   ├── log4j-handle-plugin.properties
│   │   ├── log4j.properties
│   │   ├── log4j-solr.properties
│   │   ├── modules
│   │   ├── news-side.html
│   │   ├── news-top.html
│   │   ├── news-xmlui.xml
│   │   ├── registries
│   │   ├── sfx.xml
│   │   ├── spiders
│   │   ├── spring
│   │   ├── workflow-curation.xml
│   │   ├── workflow.xml
│   │   ├── xmlui.dtd
│   │   └── xmlui.xconf
│   ├── etc
│   │   ├── oracle
│   │   └── postgres
│   ├── modules
│   │   ├── additions
│   │   ├── jspui
│   │   ├── oai
│   │   ├── pom.xml
│   │   ├── rdf
│   │   ├── rest
│   │   ├── solr
│   │   ├── sword
│   │   ├── swordv2
│   │   ├── xmlui
│   │   └── xmlui-mirage2
│   ├── pom.xml
│   ├── solr
│   │   ├── authority
│   │   ├── oai
│   │   ├── search
│   │   ├── solr.xml
│   │   └── statistics
│   ├── src
│   │   └── main
│   └── target
│       ├── archive-tmp
│       └── dspace-installer
dimitrispie commented 5 years ago
  1. Are there any permissions issues?
  2. Can you attach the dspace.cfg?
joseagaleanoc commented 5 years ago
  1. -rwxrwxr-x ######################## piwik-openaire-dspace6.diff
  2. https://www.dropbox.com/s/8y3t4kst6w05ks4/dspace.zip?dl=0
dimitrispie commented 5 years ago

The link is not working. Can you post it again?

joseagaleanoc commented 5 years ago

I have updated the link of the comment, try again please or else copy and paste the link

dimitrispie commented 5 years ago

I have updated the link of the comment, try again please or else copy and paste the link I changed the diff file. Can you try? https://www.dropbox.com/s/dwejozkz7sz62x7/piwik-openaire-dspace6.diff?dl=0

joseagaleanoc commented 5 years ago

Ok, I have applied the patch successfully. Was was affeting it? Brefore I tried to change some directories on the .diff file and place the file in different dir.

dimitrispie commented 5 years ago

I modified some entries in the patch, that are causing errors to dspace.cfg. I will close the issue.

joseagaleanoc commented 5 years ago

Dimitri could you please post the file again. The link is dead. Thanks!

dimitrispie commented 5 years ago

https://www.dropbox.com/s/lpw6mgpq8vrrdpq/piwik-openaire-dspace6.diff?dl=0