Welcome, Guest
Username: Password: Remember me

TOPIC: Enabling code/feature found on gitHub

Enabling code/feature found on gitHub 2 years 3 weeks ago #83948

  • abita1
  • abita1's Avatar
  • OFFLINE
  • Senior Lime
  • Posts: 44
  • Thank you received: 1
  • Karma: 0
Tom White put this feature set on gitHub:

"New Feature Import and Export from a new Excel format with one row ea… "

From the looks of it, this enhancement includes a new file, and a bunch of changes to various other files, stored in the admin and another folder.

What is the easiest way to make that feature happen on my server?

Manually cut/paste the entire files, or the codes subsets, and store locally, then amend the files on my local machine and up load?

This seems a bit...inefficient...

I was hopping that there would be a mere file source, to download, with each of the files-as-amended, which I could then upload to the correct directory on my server.

Clues?

[of course, if the 2.00RC7 is going to become a release in the next few days...i would wait...but if not clues/suggestions appreciated...]
Last Edit: 2 years 3 weeks ago by abita1.
The administrator has disabled public write access.

Re: Enabling code/feature found on gitHub 2 years 3 weeks ago #83950

  • TMSWhite
  • TMSWhite's Avatar
  • OFFLINE
  • LimeSurvey Team
  • Posts: 759
  • Thank you received: 82
  • Karma: 36
I had hoped that there might be an easy way to merge it into people's repositories without doing a formal pull, but if there is, I haven't found it yet.

So, if you want to play with that feature in 1.92, the easiest solution is to clone my repository (github.com/TMSWhite/LimeSurvey) and then checkout the 192_dev branch.

Assuming you installed git as per GitHub's recommendations, and launched Git Bash, do this:
git clone https://github.com/TMSWhite/LimeSurvey.git
git checkout 192_dev
git remote add upstream https://github.com/LimeSurvey/LimeSurvey.git

I tend to keep it up to date with the main branch (master), but if not, it is easy to merge in changes to the main branch.
git checkout master
git pull upstream
git checkout 192_dev
git merge master
The administrator has disabled public write access.

Re: Enabling code/feature found on gitHub 2 years 3 weeks ago #83952

  • abita1
  • abita1's Avatar
  • OFFLINE
  • Senior Lime
  • Posts: 44
  • Thank you received: 1
  • Karma: 0
I'm smiling -- while I suspect I could figure that out, the engr. in me, I haven't installed Git or GitBash on my local WinLaptop, nor anything close to that on my hired server in Arizona... So...there is no Linux box at my elbow with a repository that I can muddle with.

So...
I'm suspecting that a manual modification might work a bit faster

Would it be fair to say that the files' modifications, identified/shown on the Git website, would be susceptible to a cut/paste...?

Or better, this file:
TMSWhite-LimeSurvey-1.92_plus_120620-179-g1c94519.zip
which is exposed on the "zip" button, when the 192dev button is enabled....seems to be the entire developed LS 192+ with your changes (except the date is 6.20 and not 7.26). After taking this to my laptop, can I merely upload the 7 or so files of note, that had changes? Or should I best do a reinstall of the entire platform using that whole 192? That would be curious, since I have the 192 120725 version, which implies some collection of fixes that aren't on your 120620 (or the dating nomenclature is wrong on the version you just stashed, 45minutes ago.)

As you can tell, still a modest amount of correctable confusion in my head, better than deciphering dealing with Git, I think. Plus, my confusion, when cleared, will help me understand the branching process, on LS, so that when I get LS deciphered in my head, I can make smarter contributions in the future to development or documentation.

thanks, again !

---john

ps....if you made the changes to include your excel export...why didn't they just get landed in the 1.92+ most latest downloadable version? Seems like such a worthy step -- but I may be missing something on branching and mastering...
Last Edit: 2 years 3 weeks ago by abita1.
The administrator has disabled public write access.

Re: Enabling code/feature found on gitHub 2 years 3 weeks ago #83954

  • abita1
  • abita1's Avatar
  • OFFLINE
  • Senior Lime
  • Posts: 44
  • Thank you received: 1
  • Karma: 0
I'm beginning to realize that there may be other dependencies, in other files, and that uploading just the 8 modified files, in the current state found on your recent 192 120620, would be foolish.

So, my alternate question is....am I correct, thinking I should upload the entire directory structure, found on your 192, except for the root config.php and the /upload directory. That is, to treat your 192 as a minor upgrade to my 192.
Last Edit: 2 years 3 weeks ago by abita1.
The administrator has disabled public write access.

Re: Enabling code/feature found on gitHub 2 years 3 weeks ago #83956

  • TMSWhite
  • TMSWhite's Avatar
  • OFFLINE
  • LimeSurvey Team
  • Posts: 759
  • Thank you received: 82
  • Karma: 36
I've tried patching an existing installation with those files and it usually doesn't work right. I use XAMPP and GitBash on a Windows XP laptop, so you also don't need a Linux box. Cloning from GitHub is the safest, and believe it or not, easiest way to go.

Follow these steps:
(1)Setup Git
(2) Change to a web-readable directory (in my case, /xampp/htdocs/)
(3) Run the following
git clone https://github.com/TMSWhite/LimeSurvey.git
git checkout 192_dev

(4) Copy the config.php from your main directory into the one you checked out (which will be /limesurvey)

The whole process should take about 20-30 minutes
Last Edit: 2 years 3 weeks ago by TMSWhite.
The administrator has disabled public write access.
Moderators: ITEd
Time to create page: 0.275 seconds
Donation Image