[CWB] Update difficulties

Thu May 11 21:51:05 CEST 2023

The conflicts arise from you having at some point altered the content of the checked-out files (purposefully or inadvertently). If you'd not changed them, you wouldn't get conflicts. svn up/switch are only frictionless if you've not made any such local changes.

Since the actual line doesn't have any difference on it I suspect it was just a change in whitespace encoding.

Regardless of what changed, the solution is the same: revert the alterations. Use

          svn revert -R *

... to revert all your local files to what they were when you first checked them out.

svn switch will then run smoothly.

Re: on execution of upgrade-database.php, there was another error / PHP Parse error:  syntax error, unexpected '?' in /var/www/html/cqpweb/bin/cli-lib.php on line 170

Naturally, when the prior requisite step of updating the code has failed, running the upgrade-database.php script will either (a) not work or (b) corrupt your data - because upgrade-database.php is itself part of the code that you are updating.

No point trying that script again until you've updated the code successfully.

best

Andrew.

From: cwb-bounces at sslmit.unibo.it <cwb-bounces at sslmit.unibo.it> On Behalf Of Graham Ranger -- UAPV
Sent: 11 May 2023 17:54
To: cwb at sslmit.unibo.it
Subject: Re: [CWB] Update difficulties

Hi Andrew,
Well, the address was right with http. However, the execution of svn switch ... threw up a whole load of conflicts (many involving libraries, e.g., when I ask for differences:

(1) their version (at line 1)         |(2) your version (at line 0)
--------------------------------------+--------------------------------------
<?php require('../lib/analyse-ui.php')|<?php require('../lib/analyse.inc.php'
--------------------------------------+--------------------------------------

I backed up the mysql db, but on execution of upgrade-database.php, there was another error

PHP Parse error:  syntax error, unexpected '?' in /var/www/html/cqpweb/bin/cli-lib.php on line 170

Sorry about all this. I'm going to ask the tech to restore last night's save.
Best,
Graham.

Le 11/05/2023 à 16:54, Hardie, Andrew a écrit :

Change https to http

Andrew.

-----Original Message-----

From: cwb-bounces at sslmit.unibo.it<mailto:cwb-bounces at sslmit.unibo.it> <cwb-bounces at sslmit.unibo.it><mailto:cwb-bounces at sslmit.unibo.it> On Behalf Of Graham Ranger

Sent: 11 May 2023 15:11

To: cwb at sslmit.unibo.it<mailto:cwb at sslmit.unibo.it>

Subject: Re: [CWB] Update difficulties

Thanks again, Andrew... But drat! I get another error message telling me svn doesn't like what I'm trying.

root at srvperso-cqpweb:/var/www/html/cqpweb# svn switch

https://svn/.

code.sf.net%2Fp%2Fcwb%2Fcode%2Fgui%2Fcqpweb%2Fbranches3.2-latest&data=

05%7C01%7Chardiea%40live.lancs.ac.uk%7C6dd9c99730504dd086c608db5229973

d%7C9c9bcd11977a4e9ca9a0bc734090164a%7C0%7C0%7C638194110804639161%7CUn

known%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haW

wiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=Q%2BBHppgATV9tfGgfUHKVuajSa3q5f

bANywo1L2Ft2gI%3D&reserved=0 Error validating server certificate for

'https://svn.code.sf.net/':

 - The certificate has expired.

Certificate information:

 - Hostname: code.sourceforge.net

 - Valid: from Mar 12 03:15:54 2023 GMT until Jun 10 03:15:53 2023 GMT

 - Issuer: Let's Encrypt, US

 - Fingerprint:

22:83:F0:C1:96:B7:AE:84:FF:F4:71:25:03:05:97:AC:85:32:20:D5

(R)eject, accept (t)emporarily or accept (p)ermanently? p

svn: E155025: 'svn switch' does not support switching a working copy

to a different repository

svn: E155025: 'http://svn.code.sf.net/p/cwb/code/gui/cqpweb/trunk'

is not the same repository as

'https://svn.code.sf.net/p/cwb/code'

Many thanks in advance for any help you can give me.

Best,

Graham.

Le 11/05/2023 à 12:25, Hardie, Andrew a écrit :

Apologies, that URL should be

https://svn/.

code.sf.net%2Fp%2Fcwb%2Fcode%2Fgui%2Fcqpweb%2Fbranches3.2-latest&data=

05%7C01%7Chardiea%40live.lancs.ac.uk%7C6dd9c99730504dd086c608db5229973

d%7C9c9bcd11977a4e9ca9a0bc734090164a%7C0%7C0%7C638194110804639161%7CUn

known%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haW

wiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=Q%2BBHppgATV9tfGgfUHKVuajSa3q5f

bANywo1L2Ft2gI%3D&reserved=0

(and the trunk one is

https://svn/.

code.sf.net%2Fp%2Fcwb%2Fcode%2Fgui%2Fcqpweb%2Ftrunk&data=05%7C01%7Char

diea%40live.lancs.ac.uk%7C6dd9c99730504dd086c608db5229973d%7C9c9bcd119

77a4e9ca9a0bc734090164a%7C0%7C0%7C638194110804639161%7CUnknown%7CTWFpb

GZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0

%3D%7C3000%7C%7C%7C&sdata=v1AcRAySj3jSVBW3VMW04%2Bwgu6C6SW6nQqnsNxzJ98

E%3D&reserved=0)

I accidentally grabbed the URL of the HTML viewer instead of the actual repo in my haste...

(also: no, it does not need to be an svn:// because sf.net supports

svn over http)

Andrew.

-----Original Message-----

From: cwb-bounces at sslmit.unibo.it<mailto:cwb-bounces at sslmit.unibo.it> <cwb-bounces at sslmit.unibo.it><mailto:cwb-bounces at sslmit.unibo.it> On

Behalf Of Graham Ranger

Sent: 11 May 2023 10:57

To: cwb at sslmit.unibo.it<mailto:cwb at sslmit.unibo.it>

Subject: Re: [CWB] Update difficulties

Hi Andrew,

Thanks for this.

Yes, it is a working copy. However, svn switch command runs into problems... Specifically:

svn switch

https://sour/

ceforge.net%2Fp%2Fcwb%2Fcode%2FHEAD%2Ftree%2Fgui%2Fcqpweb%2Fbranches%2

F3.2-latest%2F&data=05%7C01%7Chardiea%40live.lancs.ac.uk%7C6dd9c997305

04dd086c608db5229973d%7C9c9bcd11977a4e9ca9a0bc734090164a%7C0%7C0%7C638

194110804639161%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2

luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=k17RrwekBYX

17XaSJymUQOplsmdmDQtidx81ubyEn9Y%3D&reserved=0

svn: E175009: Unable to connect to a repository at URL 'https://sourceforge.net/p/cwb/code/HEAD/tree/gui/cqpweb/branches/3.2-latest'

svn: E175009: XML Parsing failed: Unexpected root element 'html'

Two errors. The first appears to suggest a mistake in the URL (shouldn't it start svn:// ?), the second a problem with the local setup, as cqpweb is placed in /var/www/html and perhaps svn doesn't like this directory name...

Best,

Graham.

Le 10/05/2023 à 15:17, Hardie, Andrew a écrit :

OK, first step: is your installation a working copy?

-------------

Working copy

-------------

If it is, check "svn info" to see whether it currently points at the

trunk or the branch URL

Trunk -

https://sour/

ceforge.net%2Fp%2Fcwb%2Fcode%2FHEAD%2Ftree%2Fgui%2Fcqpweb%2Ftrunk%2F&

d

ata=05%7C01%7Chardiea%40live.lancs.ac.uk%7Cdc2e80abfe7b4ad1523908db52

0

63664%7C9c9bcd11977a4e9ca9a0bc734090164a%7C0%7C0%7C638193958871573161

%

7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6I

k

1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=etBE5YMO8dBfQVFBVqEDgrSRZS

z

KzJEm2HjraVbQ1fY%3D&reserved=0

Branch -

https://sour/

ceforge.net%2Fp%2Fcwb%2Fcode%2FHEAD%2Ftree%2Fgui%2Fcqpweb%2Fbranches%

2

F3.2-latest%2F&data=05%7C01%7Chardiea%40live.lancs.ac.uk%7Cdc2e80abfe

7

b4ad1523908db52063664%7C9c9bcd11977a4e9ca9a0bc734090164a%7C0%7C0%7C63

8

193958871573161%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV

2

luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=WxRg1mzQTi

8

O5%2F64VWUTJ7U2j3kmvvjtUXeMoAWJsew%3D&reserved=0

If you are on the Branch, just type "svn up". And your code is up to date.

If you are on the Trunk, re-point your checkout at the branch. The

command is

          svn switch

https://sour/

ceforge.net%2Fp%2Fcwb%2Fcode%2FHEAD%2Ftree%2Fgui%2Fcqpweb%2Fbranches%

2

F3.2-latest%2F&data=05%7C01%7Chardiea%40live.lancs.ac.uk%7Cdc2e80abfe

7

b4ad1523908db52063664%7C9c9bcd11977a4e9ca9a0bc734090164a%7C0%7C0%7C63

8

193958871573161%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV

2

luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=WxRg1mzQTi

8

O5%2F64VWUTJ7U2j3kmvvjtUXeMoAWJsew%3D&reserved=0

(which you must run from within the base directory of your CQPweb

checkout.)

The code will then update to the most recent version on the branch.

------------------

Not a working copy

------------------

If it's not a working copy, then go to another location, and use

          svn export

https://sour/

ceforge.net%2Fp%2Fcwb%2Fcode%2FHEAD%2Ftree%2Fgui%2Fcqpweb%2Fbranches%

2

F3.2-latest%2F&data=05%7C01%7Chardiea%40live.lancs.ac.uk%7Cdc2e80abfe

7

b4ad1523908db52063664%7C9c9bcd11977a4e9ca9a0bc734090164a%7C0%7C0%7C63

8

193958871573161%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV

2

luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=WxRg1mzQTi

8

O5%2F64VWUTJ7U2j3kmvvjtUXeMoAWJsew%3D&reserved=0 cqpweb-new-code

and then overwrite the files in the existing installation with these

new files. (You  can then delete any leftover files from the earlier

version.)

----------

Either way

----------

After that, run the upgrade-database.php script. If you want to be able to downgrade, then backup the whole database before this step.

Hope this helps

best

Andrew.

-----Original Message-----

From: cwb-bounces at sslmit.unibo.it<mailto:cwb-bounces at sslmit.unibo.it> <cwb-bounces at sslmit.unibo.it><mailto:cwb-bounces at sslmit.unibo.it> On

Behalf Of Graham Ranger

Sent: 09 May 2023 12:06

To: Open source development of the Corpus WorkBench

<cwb at sslmit.unibo.it><mailto:cwb at sslmit.unibo.it>

Subject: [CWB] Update difficulties

Hello all,

I'd like to update from 3.2.30 to the latest 3.2 version of cqpweb.

I first tried svn co

http://svn.code.sf.net/p/cwb/code/gui/cqpweb/branches/3.2-latest cqpweb but with no noticeable result. Although the update appeared to run as intended, the version displayed on the mainpage, and the various menus, remained unchanged.

I then tried a more radical approach with svn update which threw up a load of conflicts, and left me with a blank page at the web address.

I've since restored the previous state, but would appreciate any expert help in the matter. From my reading of the admin manual, the first command ought to have done the job, with no extra tweaks or database upgrades required.

Best,

Graham.

_______________________________________________

CWB mailing list

CWB at sslmit.unibo.it<mailto:CWB at sslmit.unibo.it>

http://liste/

.sslmit.unibo.it%2Fmailman%2Flistinfo%2Fcwb&data=05%7C01%7Chardiea%40

l

ive.lancs.ac.uk%7Cdc2e80abfe7b4ad1523908db52063664%7C9c9bcd11977a4e9c

a

9a0bc734090164a%7C0%7C0%7C638193958871573161%7CUnknown%7CTWFpbGZsb3d8

e

yJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3

0

00%7C%7C%7C&sdata=CA6gpVL5S5aFtF1VNn36O6VfsfU2iBdKg1viwuWCV7c%3D&rese

r

ved=0 _______________________________________________

CWB mailing list

CWB at sslmit.unibo.it<mailto:CWB at sslmit.unibo.it>

http://liste/

.sslmit.unibo.it%2Fmailman%2Flistinfo%2Fcwb&data=05%7C01%7Chardiea%40

l

ive.lancs.ac.uk%7Cdc2e80abfe7b4ad1523908db52063664%7C9c9bcd11977a4e9c

a

9a0bc734090164a%7C0%7C0%7C638193958871573161%7CUnknown%7CTWFpbGZsb3d8

e

yJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3

0

00%7C%7C%7C&sdata=CA6gpVL5S5aFtF1VNn36O6VfsfU2iBdKg1viwuWCV7c%3D&rese

r

ved=0

_______________________________________________

CWB mailing list

CWB at sslmit.unibo.it<mailto:CWB at sslmit.unibo.it>

http://liste/

.sslmit.unibo.it%2Fmailman%2Flistinfo%2Fcwb&data=05%7C01%7Chardiea%40l

ive.lancs.ac.uk%7C6dd9c99730504dd086c608db5229973d%7C9c9bcd11977a4e9ca

9a0bc734090164a%7C0%7C0%7C638194110804639161%7CUnknown%7CTWFpbGZsb3d8e

yJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C30

00%7C%7C%7C&sdata=HNnk0Ypqw7hjarXcjKQW2u5T4K6dVJ6wMNcZ33cnBI4%3D&reser

ved=0 _______________________________________________

CWB mailing list

CWB at sslmit.unibo.it<mailto:CWB at sslmit.unibo.it>

http://liste/

.sslmit.unibo.it%2Fmailman%2Flistinfo%2Fcwb&data=05%7C01%7Chardiea%40l

ive.lancs.ac.uk%7C6dd9c99730504dd086c608db5229973d%7C9c9bcd11977a4e9ca

9a0bc734090164a%7C0%7C0%7C638194110804639161%7CUnknown%7CTWFpbGZsb3d8e

yJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C30

00%7C%7C%7C&sdata=HNnk0Ypqw7hjarXcjKQW2u5T4K6dVJ6wMNcZ33cnBI4%3D&reser

ved=0

_______________________________________________

CWB mailing list

CWB at sslmit.unibo.it<mailto:CWB at sslmit.unibo.it>

http://liste.sslmit.unibo.it/mailman/listinfo/cwb

_______________________________________________

CWB mailing list

CWB at sslmit.unibo.it<mailto:CWB at sslmit.unibo.it>

http://liste.sslmit.unibo.it/mailman/listinfo/cwb

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://liste.sslmit.unibo.it/pipermail/cwb/attachments/20230511/ae0db0db/attachment-0001.html>