Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename all xsd files (and references to them) to not contain version #14

Merged

Conversation

csolem
Copy link
Contributor

@csolem csolem commented Apr 3, 2018

See #13

Change was done using two bash one-liners:

find . -iname "*.xsd" | while read file; do newName=$(echo $file | sed 's/-v1\.[0-9]//g');  if [ "$file" != "$newName" ]; then echo "$file -> $newName"; mv $file $newName; fi; done;
find . -iname "*.xsd" | while read file; do sed -i 's/-v1\.[0-9]//g' $file; done;

Changes have been confirmed to work with xmllint and a valid netex xml file:

 xmllint --noout --schema xsd/NeTEx_publication.xsd some_netex_file.xml

Verification of compatibility with other currently unmerged pull requests:
I have tested that it is possible to merge this code into the branch containing #9

@skinkie
Copy link
Contributor

skinkie commented Apr 3, 2018

I would love to merge this directly... but I guess @nick-knowles which has 1.09 will be very angry. Hence I would like to see his pull request to see how this conflicts.

@csolem
Copy link
Contributor Author

csolem commented Apr 4, 2018

Ok. Where is the ongoing work for 1.09 located, @nick-knowles ? Is this a separate fork of this NeTEx-CEN repository? Maybe I could help to verify that this change is something that could easily be merged?

@nick-knowles
Copy link
Contributor

I created the branch on my client (using the GITHUB Desktop) but when I tried to publish it I got a message.

"Authentication failed. You may not have permission to access the repository or the repository may have been archived. Open options and verify that you're signed in with an account that has permission to access this repository." I contacted stefan to report the issue but havent resolved it yet. My suspicion is that I need to be grated the appropriate upload rights

If some one can suggest another way of forcing github to publish it great

As an emergency stopgap I placed a zip of the 1.09 version on the NeTEx site. It inccudes (a) The reanmes of a few Fare Entities to follow TM 6 (b) fixes so that all the examples validate. (c) several small typos fixes and minor corrections.

Obviously need to resolved the authentication issue as it is a total pain if I am having to use a different process

@csolem
Copy link
Contributor Author

csolem commented Apr 6, 2018

Another way of publishing to github until permissions are fixed:
Only solution I can think of is to:

  • Fork this repository to your https://github.com/nick-knowles (Seems like you already have this fork)
  • Create a branch from this (netex-cen) repository's master in your fork. (Requires git remote to be configured to both local and NeTEx-CEN repository)
    git checkout NeTEx-CEN/master -b newbranch
  • Finally, push and create a pull request from that branch.

@skinkie
Copy link
Contributor

skinkie commented Aug 8, 2018

Why the revert?

@csolem
Copy link
Contributor Author

csolem commented Aug 8, 2018

I reverted because after other changes it's easier to do it again.
Question: Should the siri version suffix be dropped as well?

@skinkie
Copy link
Contributor

skinkie commented Aug 8, 2018

I wonder what the upstream SIRI XSD looks like. We might want to update that 'in place' or better: have it actually as submodule in this project.

@skinkie
Copy link
Contributor

skinkie commented Aug 8, 2018

Net me know if you want to merge the pull request.

@csolem
Copy link
Contributor Author

csolem commented Aug 8, 2018

Updated with:
find . -iname "*.xsd" | grep -v siri | while read file; do newName=$(echo $file | sed 's/-v[0-9]\.[0-9]//g'); if [ "$file" != "$newName" ]; then echo "$file -> $newName"; mv $file $newName; fi; done;

and using intellij with:
(?<!(siri_)(utility|location|request_errorConditions|requests|types|participant|base|common_services|request_support|requests_errorConditions))-v[0-9].[0-9]\.xsd

Validation of examples gives the same amount of issues as the master branch.

@csolem
Copy link
Contributor Author

csolem commented Aug 8, 2018

The PR is read for review and merging

@skinkie skinkie merged commit e6478d0 into NeTEx-CEN:master Aug 8, 2018
seime added a commit to syversenkr/NeTEx that referenced this pull request Dec 10, 2020
Add support for NAND, NOR, XNOR as a LogicalOperation.
seime added a commit to syversenkr/NeTEx that referenced this pull request Dec 10, 2020
Aurige added a commit to Aurige/NeTEx that referenced this pull request Oct 13, 2023
Update of the Pr411 (that was merged and rolled back due to issues with examples uising UIC periods) and PR518 (broken for whatever github reason)

This version integrates the decisions from the Meeting NeTEx-CEN#13 and NeTEx-CEN#14:

    Update of examples to use OperatingDayRef in dated jouneys (keep the old UIC periods commented with an explicit mention of the deprecation).
    UicOperatingPeriod deletion is now replaced by a simple deprecation (clearly stated in comments) for backward compatibility reasons.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants